summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrank Ch. Eigler <fche@elastic.org>2009-01-30 15:16:05 -0500
committerFrank Ch. Eigler <fche@elastic.org>2009-01-30 15:16:30 -0500
commitdf79aa4b87b39a64867c343f1bcd22c7e675aa43 (patch)
tree0c946e42078c2ed945c0e535212702aa0a27c2d3
parent1cc8a4c78bff79ea8b60e916e5cd01571b469b03 (diff)
downloadsystemtap-steved-df79aa4b87b39a64867c343f1bcd22c7e675aa43.tar.gz
systemtap-steved-df79aa4b87b39a64867c343f1bcd22c7e675aa43.tar.xz
systemtap-steved-df79aa4b87b39a64867c343f1bcd22c7e675aa43.zip
tweak git_version.h generation
-rw-r--r--ChangeLog6
-rwxr-xr-xgit_version.sh1
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 03cf19b0..c15fa0fb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-01-30 Frank Ch. Eigler <fche@elastic.org>
+
+ * git_version.sh: Don't print GIT_BRANCH into GIT_MESSAGE, as it
+ is local, and "(no branch)" confuses other stuff. The SHA1 commit
+ ID is enough.
+
2009-01-29 Dave Brolley <brolley@redhat.com>
* stap-client (initialization): Set our_host_name and our_domain_name
diff --git a/git_version.sh b/git_version.sh
index 50658970..d39d96c9 100755
--- a/git_version.sh
+++ b/git_version.sh
@@ -307,7 +307,6 @@ cat<<EOF
# else /* !GIT_NOT_FOUND */
# define GIT_MESSAGE \\
GIT_DIST_MSG \\
- "git branch " GIT_BRANCH ", " \\
"commit " GIT_SHAID GIT_DIRTY_MSG \\
GIT_ERROR_MSG
# endif /* GIT_NOT_FOUND */