summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorH.J. Lu <hjl.tools@gmail.com>2015-01-06 10:26:27 -0800
committerH.J. Lu <hjl.tools@gmail.com>2015-01-06 10:26:27 -0800
commit69ba4298ddda5a2cba8b613f666938cf886897fa (patch)
tree8595ee1ef73a8f4061aa8d3028b68e0ad1a26d3c
parent975c2216a1c8baa37b4c05695b4c66e455e4eec9 (diff)
downloadbinutils-gdb-69ba4298ddda5a2cba8b613f666938cf886897fa.tar.gz
Get branch name from commit
-rw-r--r--bfd/Makefile.am2
-rw-r--r--bfd/Makefile.in2
2 files changed, 2 insertions, 2 deletions
diff --git a/bfd/Makefile.am b/bfd/Makefile.am
index a9e4ad9ba74..0882c7c6b10 100644
--- a/bfd/Makefile.am
+++ b/bfd/Makefile.am
@@ -1046,8 +1046,8 @@ bfdver.h: $(srcdir)/version.h $(srcdir)/development.sh $(srcdir)/Makefile.in
*sourceware.org/git/binutils-gdb.git) \
bfd_remote_git_repo="git://sourceware.org/git/binutils.git";; \
esac; \
- bfd_git_branch=`git status | grep "On branch" | sed -e "s/.*On branch //"` ;\
bfd_git_commit=`git log -1 --pretty=%H` ;\
+ bfd_git_branch=`git name-rev --name-only $$bfd_git_commit` ;\
bfd_version_string="\"$(VERSION).$${bfd_version_date}\\\n from $$bfd_remote_git_repo commit $$bfd_git_commit on $$bfd_git_branch\"" ;\
cd $$here; \
else \
diff --git a/bfd/Makefile.in b/bfd/Makefile.in
index 298232528ce..334c41ba1af 100644
--- a/bfd/Makefile.in
+++ b/bfd/Makefile.in
@@ -2108,8 +2108,8 @@ bfdver.h: $(srcdir)/version.h $(srcdir)/development.sh $(srcdir)/Makefile.in
*sourceware.org/git/binutils-gdb.git) \
bfd_remote_git_repo="git://sourceware.org/git/binutils.git";; \
esac; \
- bfd_git_branch=`git status | grep "On branch" | sed -e "s/.*On branch //"` ;\
bfd_git_commit=`git log -1 --pretty=%H` ;\
+ bfd_git_branch=`git name-rev --name-only $$bfd_git_commit` ;\
bfd_version_string="\"$(VERSION).$${bfd_version_date}\\\n from $$bfd_remote_git_repo commit $$bfd_git_commit on $$bfd_git_branch\"" ;\
cd $$here; \
else \