~ chicken-core (chicken-5) c7d571753a3db9381545e0b466f69fd0192eb13e
commit c7d571753a3db9381545e0b466f69fd0192eb13e
Author: felix <felix@call-with-current-continuation.org>
AuthorDate: Sun Jul 17 23:37:19 2011 +0200
Commit: felix <felix@call-with-current-continuation.org>
CommitDate: Sun Jul 17 23:37:19 2011 +0200
look, it's not my fault git is so stupid, ok?
diff --git a/identify-branch.sh b/identify-branch.sh
index f98c65ee..89a68f13 100755
--- a/identify-branch.sh
+++ b/identify-branch.sh
@@ -5,10 +5,10 @@
# usage: identify-branch SOURCEDIR
if test -d "$1/.git"; then
- branchname=`GIT_DIR="$1/.git" git branch --no-color 2> /dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/(\1)/'`
+ branchname=`GIT_DIR="$1/.git" git branch --no-color 2> /dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/\1/'`
case ${branchname} in
"") ;;
- "(master)") ;;
+ "master") ;;
*) echo "${branchname}";;
esac
fi
diff --git a/library.scm b/library.scm
index e7a1db8c..113d2cc2 100644
--- a/library.scm
+++ b/library.scm
@@ -3548,14 +3548,17 @@ EOF
(if (##sys#fudge 32) " gchooks" "")
(if (##sys#fudge 39) " cross" "") ) ) )
(string-append
- "Version " +build-version+ " " +branch-name+ "\n"
+ "Version " ##sys#build-version
+ (if ##sys#build-branch (string-append " (" ##sys#build-branch ")") "")
+ (if ##sys#build-id (string-append " (rev " ##sys#build-id ")") "")
+ "\n"
(get-config)
(if (zero? (##sys#size spec))
""
(string-append " [" spec " ]") )
"\n"
- +build-tag+))
- +build-version+) )
+ (or ##sys#build-tag "")))
+ ##sys#build-version) )
;;; Feature identifiers:
Trap