From 7d1528e6013fef6520d8844e3c0ac466f164ace7 Mon Sep 17 00:00:00 2001 From: Rafaël Carré Date: Thu, 4 Jun 2009 15:05:00 +0000 Subject: version.sh : fix revision in git-svn trees "git log .. -1" only shows one commit (the last one), so extract the last line (git-svn-id:..) with tail -n 1, instead of the first line (which is the committer's message in case of multi lines body) git-svn-id: svn://svn.rockbox.org/rockbox/trunk@21188 a1c6a512-1295-4272-9138-f99709370657 --- tools/version.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tools') diff --git a/tools/version.sh b/tools/version.sh index 7d67fabc8b..25e781c784 100755 --- a/tools/version.sh +++ b/tools/version.sh @@ -40,7 +40,7 @@ gitversion() { if head=`git rev-parse --verify --short HEAD 2>/dev/null`; then # Get the svn revision of the most recent git-svn commit - version=`git log --pretty=format:'%b' --grep='git-svn-id: svn' -1 | head -n 1 | perl -ne 'm/@(\d*)/; print "r" . $1;'` + version=`git log --pretty=format:'%b' --grep='git-svn-id: svn' -1 | tail -n 1 | perl -ne 'm/@(\d*)/; print "r" . $1;'` mod="" # Is this a git-svn commit? if ! git log HEAD^.. --pretty=format:"%b" | grep -q "git-svn-id: svn" ; then -- cgit v1.2.3