On Tue, Jan 14, 2020 at 10:12:09AM +0100, Jakub Jelinek wrote:
> Note, for the scripts running on sourceware I also had to remove those tags/
> part, but thought it is because of running against the bare repo.
> We could change those into ^\\(tags/\\)\\?basepoints/gcc- etc. (and adjust
> the \\1.
> I'll post a patch.
Here it is, tested on x86_64-linux, ok for trunk?
2020-01-15 Jakub Jelinek <ja...@redhat.com>
* gcc-git-customization.sh: Handle output of older git which doesn't
print tags/ prefixes before branchpoint/gcc-.
--- contrib/gcc-git-customization.sh.jj 2020-01-13 15:15:00.472393417 +0100
+++ contrib/gcc-git-customization.sh 2020-01-14 15:09:33.364634082 +0100
@@ -22,8 +22,8 @@ git config alias.svn-rev '!f() { rev=$1;
# Add git commands to convert git commit to monotonically increasing revision
number
# and vice versa
-git config alias.gcc-descr \!"f() { if test \${1:-no} = --full; then r=\$(git
describe --all --abbrev=40 --match 'basepoints/gcc-[0-9]*' \${2:-master} | sed
-n 's,^tags/basepoints/gcc-,r,p'); expr match \${r:-no} '^r[0-9]\\+\$'
>/dev/null && r=\${r}-0-g\$(git rev-parse \${2:-master}); test -n \$r && echo
\${r}; else git describe --all --match 'basepoints/gcc-[0-9]*' \${1:-master} |
sed -n
's,^tags/basepoints/gcc-\\([0-9]\\+\\)-\\([0-9]\\+\\)-g[0-9a-f]*\$,r\\1-\\2,p;s,^tags/basepoints/gcc-\\([0-9]\\+\\)\$,r\\1-0,p';
fi; }; f"
-git config alias.gcc-undescr \!"f() { o=\$(git config --get
gcc-config.upstream); r=\$(echo \$1 | sed -n
's,^r\\([0-9]\\+\\)-[0-9]\\+\$,\\1,p'); n=\$(echo \$1 | sed -n
's,^r[0-9]\\+-\\([0-9]\\+\\)\$,\\1,p'); test -z \$r && echo Invalid id \$1 &&
exit 1; h=\$(git rev-parse --verify --quiet \${o:-origin}/releases/gcc-\$r);
test -z \$h && h=\$(git rev-parse --verify --quiet \${o:-origin}/master);
p=\$(git describe --all --match 'basepoints/gcc-'\$r \$h | sed -n
's,^tags/basepoints/gcc-[0-9]\\+-\\([0-9]\\+\\)-g[0-9a-f]*\$,\\1,p;s,^tags/basepoints/gcc-[0-9]\\+\$,0,p');
git rev-parse --verify \$h~\$(expr \$p - \$n); }; f"
+git config alias.gcc-descr \!"f() { if test \${1:-no} = --full; then r=\$(git
describe --all --abbrev=40 --match 'basepoints/gcc-[0-9]*' \${2:-master} | sed
-n 's,^\\(tags/\\)\\?basepoints/gcc-,r,p'); expr match \${r:-no} '^r[0-9]\\+\$'
>/dev/null && r=\${r}-0-g\$(git rev-parse \${2:-master}); test -n \$r && echo
\${r}; else git describe --all --match 'basepoints/gcc-[0-9]*' \${1:-master} |
sed -n
's,^\\(tags/\\)\\?basepoints/gcc-\\([0-9]\\+\\)-\\([0-9]\\+\\)-g[0-9a-f]*\$,r\\2-\\3,p;s,^\\(tags/\\)\\?basepoints/gcc-\\([0-9]\\+\\)\$,r\\2-0,p';
fi; }; f"
+git config alias.gcc-undescr \!"f() { o=\$(git config --get
gcc-config.upstream); r=\$(echo \$1 | sed -n
's,^r\\([0-9]\\+\\)-[0-9]\\+\$,\\1,p'); n=\$(echo \$1 | sed -n
's,^r[0-9]\\+-\\([0-9]\\+\\)\$,\\1,p'); test -z \$r && echo Invalid id \$1 &&
exit 1; h=\$(git rev-parse --verify --quiet \${o:-origin}/releases/gcc-\$r);
test -z \$h && h=\$(git rev-parse --verify --quiet \${o:-origin}/master);
p=\$(git describe --all --match 'basepoints/gcc-'\$r \$h | sed -n
's,^\\(tags/\\)\\?basepoints/gcc-[0-9]\\+-\\([0-9]\\+\\)-g[0-9a-f]*\$,\\2,p;s,^\\(tags/\\)\\?basepoints/gcc-[0-9]\\+\$,0,p');
git rev-parse --verify \$h~\$(expr \$p - \$n); }; f"
# Make diff on MD files uses "(define" as a function marker.
# Use this in conjunction with a .gitattributes file containing
Jakub
