[cmucl-commit] [git] CMU Common Lisp branch master updated. snapshot-2013-04-24-gc349b26

[Raymond Toy]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMU Common Lisp".

The branch, master has been updated
       via  c349b260bfbd99949e4fbc07c9b295ce0ed6118a (commit)
      from  31b1a5a17dfebc3fd532f4443e7cbad70be2b4ba (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit c349b260bfbd99949e4fbc07c9b295ce0ed6118a
Author: Raymond Toy <toy.raymond at gmail.com>
Date:   Sat May 4 21:03:34 2013 -0700

    Support older versions of git that don't support describe --dirty.
    Just use plain describe, which is close enough.

diff --git a/bin/load-world.sh b/bin/load-world.sh
index 8b8c2eb..1aa89ba 100755
--- a/bin/load-world.sh
+++ b/bin/load-world.sh
@@ -11,8 +11,10 @@ usage()
 
 SKIP_PCL=
 NO_PCL_FEATURE=
-# Default version is the date with the git hash.
-GIT_HASH="`(cd src; git describe --dirty 2>/dev/null)`"
+# Default version is the date with the git hash.  Older versions of
+# git don't support --dirty, but the output in that case is what we
+# want (except for ending with "dirty"), so we're set.
+GIT_HASH="`(cd src; git describe --dirty 2>/dev/null || git describe 2>/dev/null)`"
 
 # If the git hash looks like a snapshot tag or release, don't add the date.
 VERSION="`date '+%Y-%m-%d %H:%M:%S'`${GIT_HASH:+ $GIT_HASH}"

-----------------------------------------------------------------------

Summary of changes:
 bin/load-world.sh |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMU Common Lisp