bash prompt: print unique detached HEAD abbreviated object name

szeder · szeder · commit e8f21caf9428 · 2013-06-24T17:22:09.000+02:00
When describing a detached HEAD according to the $GIT_PS1_DESCRIBE
environment variable fails, __git_ps1() runs 'cut -c1-7 .git/HEAD' to
show the 7 hexdigits abbreviated commit object name in the prompt.
Obviously, this neither respects core.abbrev nor produces a unique
object name.

Fix this by using 'git rev-parse --short HEAD' instead and adjust the
corresponding test to use non-standard number of hexdigits.

Signed-off-by: SZEDER Gábor &lt;szeder@ira.uka.de&gt;
diff --git a/contrib/completion/git-prompt.sh b/contrib/completion/git-prompt.sh
@@ -392,7 +392,7 @@ __git_ps1 ()
 					git describe --tags --exact-match HEAD ;;
 				esac 2>/dev/null)" ||
 
-				b="$(cut -c1-7 "$g/HEAD" 2>/dev/null)..." ||
+				b="$(git rev-parse --short HEAD 2>/dev/null)..." ||
 				b="unknown"
 				b="($b)"
 			}
diff --git a/t/t9903-bash-prompt.sh b/t/t9903-bash-prompt.sh
@@ -50,7 +50,8 @@ test_expect_success SYMLINKS 'prompt - branch name - symlink symref' '
 '
 
 test_expect_success 'prompt - detached head' '
-	printf " ((%s...))" $(git log -1 --format="%h" b1^) >expected &&
+	printf " ((%s...))" $(git log -1 --format="%h" --abbrev=13 b1^) >expected &&
+	test_config core.abbrev 13 &&
 	git checkout b1^ &&
 	test_when_finished "git checkout master" &&
 	__git_ps1 >"$actual" &&

Original file line number	Diff line number	Diff line change
`@@ -392,7 +392,7 @@ __git_ps1 ()`
`392`	`392`	`git describe --tags --exact-match HEAD ;;`
`393`	`393`	`esac 2>/dev/null)" \|\|`
`394`	`394`
`395`		`- b="$(cut -c1-7 "$g/HEAD" 2>/dev/null)..." \|\|`
	`395`	`+ b="$(git rev-parse --short HEAD 2>/dev/null)..." \|\|`
`396`	`396`	`b="unknown"`
`397`	`397`	`b="($b)"`
`398`	`398`	`}`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,8 @@ test_expect_success SYMLINKS 'prompt - branch name - symlink symref' '`
`50`	`50`	`'`
`51`	`51`
`52`	`52`	`test_expect_success 'prompt - detached head' '`
`53`		`- printf " ((%s...))" $(git log -1 --format="%h" b1^) >expected &&`
	`53`	`+ printf " ((%s...))" $(git log -1 --format="%h" --abbrev=13 b1^) >expected &&`
	`54`	`+ test_config core.abbrev 13 &&`
`54`	`55`	`git checkout b1^ &&`
`55`	`56`	`test_when_finished "git checkout master" &&`
`56`	`57`	`__git_ps1 >"$actual" &&`