[prev in list] [next in list] [prev in thread] [next in thread] 

List:       git
Subject:    setlocalversion wasn't producing git labels for bisect
From:       David Greaves <david () dgreaves ! com>
Date:       2008-08-30 19:43:03
Message-ID: 48B9A2C7.3080001 () dgreaves ! com
[Download RAW message or body]

Trying to do a bisect with git version 1.5.6.3 didn't work with the setlocalversion \
script

Running
  git name-rev --tags HEAD
gives the output
  HEAD tags/v2.6.27-rc4~44^2

This isn't matched by setlocalversion regexp so it makes it harder to make \
deb-pkg/install/grub/reboot/remove

Of course if this patch is accepted it is going to make life complicated when \
bisecting around it. Maybe git should behave as the man page suggests and have the ^X \
before the ~nnn? (maybe it has been fixed already)  \
http://www.kernel.org/pub/software/scm/git/docs/v1.5.6.5/git-name-rev.html shows an \
example:  33db5f4d9027a10e477ccf054b2c1ab94f74c85a tags/v0.99^0~940

David

commit 511c5f04eb2df03dbbae97ede82913da1f141f86
Author: David Greaves <david@dgreaves.com>
Date:   Sat Aug 30 14:53:35 2008 +0100

    setlocalversion wasn't producing git labels for bisect

diff --git a/scripts/setlocalversion b/scripts/setlocalversion
index 83b7512..89f126d 100755
--- a/scripts/setlocalversion
+++ b/scripts/setlocalversion
@@ -11,7 +11,7 @@ cd "${1:-.}" || usage
 # Check for git and a git repo.
 if head=`git rev-parse --verify HEAD 2>/dev/null`; then
 	# Do we have an untagged version?
-	if git name-rev --tags HEAD | grep -E '^HEAD[[:space:]]+(.*~[0-9]*|undefined)$' > \
/dev/null; then +	if git name-rev --tags HEAD | grep -E \
'^HEAD[[:space:]]+(.*~[0-9^]*|undefined)$' > /dev/null; then  if tag=`git describe \
2>/dev/null`; then  echo $tag | awk -F- '{printf("-%05d-%s", $(NF-1),$(NF))}'
 		fi

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[prev in list] [next in list] [prev in thread] [next in thread]