diff mbox series

[COMMITTED] contrib/gcc_update: Insert "tformat:" for git log --pretty=tformat:%p:%t:%H

Message ID 202001170747.00H7ljnC021131@ignucius.se.axis.com
State New
Headers show
Series [COMMITTED] contrib/gcc_update: Insert "tformat:" for git log --pretty=tformat:%p:%t:%H | expand

Commit Message

Hans-Peter Nilsson Jan. 17, 2020, 7:47 a.m. UTC 
Really old git versions (like 1.6.0) require
"git log --pretty=tformat:%p:%t:%H"
or else we see:

Updating GIT tree
Current branch master is up to date.
fatal: invalid --pretty format: %p:%t:%H
Adjusting file timestamps
Touching gcc/config.in...
Touching gcc/config/arm/arm-tune.md...

...and an empty revision in LAST_UPDATED and gcc/REVISION.
In its absence, for newer git versions, "tformat" is the default
qualifier, documented as such default for at least git-2.11.0.

Committed as obvious.

brgds, H-P
diff mbox series

Patch

diff --git a/contrib/ChangeLog b/contrib/ChangeLog
index 16d0667..4e89b8d 100644
--- a/contrib/ChangeLog
+++ b/contrib/ChangeLog
@@ -1,3 +1,8 @@ 
+2020-01-17  Hans-Peter Nilsson  <hp@axis.com>
+
+	* gcc_update <git revision>: Use git log "--pretty=tformat:%p:%t:%H",
+	not "--pretty=%p:%t:%H".
+
 2020-01-16  Andreas Schwab  <schwab@linux-m68k.org>
 
 	* gcc-git-customization.sh: Avoid double expansion.
diff --git a/contrib/gcc_update b/contrib/gcc_update
index 5df3297..8c980b1 100755
--- a/contrib/gcc_update
+++ b/contrib/gcc_update
@@ -330,7 +330,7 @@  case $vcs_type in
             exit 1
 	fi
 
-	revision=`$GCC_GIT log -n1 --pretty=%p:%t:%H`
+	revision=`$GCC_GIT log -n1 --pretty=tformat:%p:%t:%H`
 	branch=`$GCC_GIT name-rev --name-only HEAD || :`
 	;;