summaryrefslogtreecommitdiff
path: root/set-serial.sh
diff options
context:
space:
mode:
authorPeter Simons <simons@cryp.to>2014-02-18 12:17:38 +0100
committerPeter Simons <simons@cryp.to>2014-02-18 12:17:38 +0100
commite830c8b06a0058b317a8dedfbc51a83de274ad5a (patch)
tree53bcb1d2005278dcb8f59dddf018ea20697dd83c /set-serial.sh
parent7a97956f261a43897e88c14ef3b2f650fadc8556 (diff)
downloadautoconf-archive-e830c8b06a0058b317a8dedfbc51a83de274ad5a.tar.gz
Deal with changed git-log behavior in version 1.9.x.
The latest version of git-log tracks the origin of a given file through sub-module commits. The macro AX_ABSOLUTE_HEADER, for instance, used to have 6 commits attributed to it, but now it has 26: $ git log --oneline -- m4/ax_absolute_header.m4 27948f4 ALL: update web site URL to http://www.gnu.org/software/autoconf-archive/MACRO-NAME.html c6b6f51 Assigned all macros a unique serial number. 89b80e0 Augmented the text of the all-permissive license by an express warranty disclaimer. d722dcd Add AU_ALIAS calls to new files for all recently renamed macros. 6fc99d3 Center the URL at the top of every file and use consistent word-wrapping. acffb06 Rename gl_TRILINOS_ABSOLUTE_HEADER to AX_ABSOLUTE_HEADER. 054e8ad remove m4 submodule fa1b1bb m4: update reference to macro branch 548839e m4: update reference to macro branch d9afb8a m4: update reference to macro branch 8968e9d m4: update reference to macro branch 862b513 Avoid non-ASCII characters in m4 files. d7160b6 m4: update reference to macro branch 9062013 m4: update reference to macro branch 3cf85b5 m4: update reference to macro branch 49af2e9 m4: update reference to macro branch 950f2a7 m4: update reference to macro branch c610f41 m4: update reference to macro branch 78d7777 m4: update reference to macro branch ddd0b53 m4: update reference to macro branch fcb87e1 m4: update reference to macro branch 702ea3c m4: update reference to macro branch cee9eea m4: update reference to macro branch e3df236 m4: update reference to macro branch 3c89e38 m4: update reference to macro branch 3b30002 maint: added initial version of the toolchain This new behavior means that most of our macros suddenly experience large bumps in their #serial number for no apparent reason. To prevent this situation, we limit the version history git-log may consider to 054e8ad..HEAD, i.e. all commits prior to the sub-module merge don't count. This gives us the old behavior of git-log back.
Diffstat (limited to 'set-serial.sh')
-rwxr-xr-xset-serial.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/set-serial.sh b/set-serial.sh
index 7e52ed4..5ee3e8e 100755
--- a/set-serial.sh
+++ b/set-serial.sh
@@ -14,7 +14,7 @@ set_serial_number()
for n in "$@"; do
echo "$n ... "
# Determine the number of revisions that have occurred to the macro.
- revision=$(git log --oneline -- "$n" | wc -l)
+ revision=$(git log --oneline 054e8ad8c766afa7059d8cd4a81bbfa99133ef5e..HEAD -- "$n" | wc -l)
# Check whether git regards the file as "modified" now. If it does,
# the serial number needs to be bumped one more time.
if ! git diff --quiet --exit-code HEAD -- "$n"; then