summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShawn O. Pearce <spearce@spearce.org>2008-02-24 08:07:33 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-02-24 18:01:24 (GMT)
commit27c578885a0b8f56430c5a24f558e2b45cf04a38 (patch)
tree1602dd6217adb5ff9b138b6fb265d36acee3d305
parent2c33f7575452f53382dcf77fdc88a2ea5d46f09d (diff)
downloadgit-27c578885a0b8f56430c5a24f558e2b45cf04a38.zip
git-27c578885a0b8f56430c5a24f558e2b45cf04a38.tar.gz
git-27c578885a0b8f56430c5a24f558e2b45cf04a38.tar.bz2
Use git-describe --exact-match in bash prompt on detached HEAD
Most of the time when I am on a detached HEAD and I am not doing a rebase or bisect operation the working directory is sitting on a tagged release of the repository. Showing the tag name instead of the commit SHA-1 is much more descriptive and a much better reminder of the state of this working directory. Now that git-describe --exact-match is available as a cheap means of obtaining the exact annotated tag or nothing at all, we can favor the annotated tag name over the abbreviated commit SHA-1. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rwxr-xr-xcontrib/completion/git-completion.bash5
1 files changed, 4 insertions, 1 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 4ea727b..8722a68 100755
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -91,7 +91,10 @@ __git_ps1 ()
fi
if ! b="$(git symbolic-ref HEAD 2>/dev/null)"
then
- b="$(cut -c1-7 $g/HEAD)..."
+ if ! b="$(git describe --exact-match HEAD 2>/dev/null)"
+ then
+ b="$(cut -c1-7 $g/HEAD)..."
+ fi
fi
fi