diff options
| author | Serge Belyshev <belyshev@depni.sinp.msu.ru> | 2021-07-15 20:19:18 +0300 |
|---|---|---|
| committer | Serge Belyshev <belyshev@depni.sinp.msu.ru> | 2021-09-06 15:34:39 +0300 |
| commit | 78b34cd8a803aa89e64949e99ce2e6b4f64d6b54 (patch) | |
| tree | 9ef1bbca6444919f2add73046342ae10268d6ca0 /contrib | |
| parent | 652bef70d392f9541b12ef65b461009c8c8fd54a (diff) | |
gcc_update: use human readable name for revision string in gcc/REVISION
contrib/Changelog:
* gcc_update: Derive human readable name for HEAD using git describe
like "git gcc-descr" with short commit hash. Drop "revision" from
gcc/REVISION.
Diffstat (limited to 'contrib')
| -rwxr-xr-x | contrib/gcc_update | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/contrib/gcc_update b/contrib/gcc_update index 80fac9fc995..ce472545e25 100755 --- a/contrib/gcc_update +++ b/contrib/gcc_update @@ -332,7 +332,22 @@ case $vcs_type in exit 1 fi - revision=`$GCC_GIT log -n1 --pretty=tformat:%p:%t:%H` + # Open-coded version of "git gcc-descr" from contrib/gcc-git-customization.sh + revision=`$GCC_GIT log -n1 --pretty=tformat:%h` + r=`$GCC_GIT describe --all --match 'basepoints/gcc-[0-9]*' HEAD \ + | 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'`; + if test -n $r; then + o=`$GCC_GIT config --get gcc-config.upstream`; + rr=`echo $r | sed -n 's,^r\([0-9]\+\)-[0-9]\+\(-g[0-9a-f]\+\)\?$,\1,p'`; + if $GCC_GIT rev-parse --verify --quiet ${o:-origin}/releases/gcc-$rr >/dev/null; then + m=releases/gcc-$rr; + else + m=master; + fi; + if $GCC_GIT merge-base --is-ancestor HEAD ${o:-origin}/$m; then + revision=${r}-g${revision}; + fi + fi branch=`$GCC_GIT name-rev --name-only HEAD || :` ;; @@ -414,6 +429,6 @@ rm -f LAST_UPDATED gcc/REVISION date echo "`TZ=UTC date` (revision $revision)" } > LAST_UPDATED -echo "[$branch revision $revision]" > gcc/REVISION +echo "[$branch $revision]" > gcc/REVISION touch_files_reexec |