diff options
| author |  SZEDER Gábor <szeder@ira.uka.de> | 2013-06-24 12:49:19 +0200 |
|---|---|---|
| committer | SZEDER Gábor <szeder@ira.uka.de> | 2013-06-24 18:03:37 +0200 |
| commit | 0f37c125814afc8ad2fa43fecd8b200216ebfab5 (patch) | |
| tree | 8361a91e976b7b66f4b2ac704ca8e9b1a5dfd4aa /contrib | |
| parent | bash prompt: combine 'git rev-parse' for detached head (diff) | |
| download | tgif-0f37c125814afc8ad2fa43fecd8b200216ebfab5.tar.xz | |
bash prompt: use bash builtins to check for unborn branch for dirty state
When the dirty work tree and index status indicator is enabled,
__git_ps1() checks for changes in the index by running 'git diff-index
--cached --quiet HEAD --' and looking at its exit code. However, that
makes sense only when HEAD points to a valid commit: on an unborn
branch the failure of said command would be caused by the invalid
HEAD, not by changes in the index. Therefore, __git_ps1() first
checks for a valid HEAD by running 'git rev-parse --quiet --verify
HEAD'.
Since the previous patch we implicitly check HEAD's validity by
running 'git rev-parse ... --short HEAD', making the dirty status
indicator's 'git rev-parse' check redundant. It's sufficient to check
for non-emptyness of the variable holding the abbreviated commit
object name, thereby sparing the overhead of fork()+exec()ing a git
process.
Signed-off-by: SZEDER Gábor <szeder@ira.uka.de>
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/completion/git-prompt.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/completion/git-prompt.sh b/contrib/completion/git-prompt.sh index 88d6121d2e..6e8f486e66 100644 --- a/contrib/completion/git-prompt.sh +++ b/contrib/completion/git-prompt.sh @@ -429,7 +429,7 @@ __git_ps1 () [ "$(git config --bool bash.showDirtyState)" != "false" ] then git diff --no-ext-diff --quiet --exit-code || w="*" - if git rev-parse --quiet --verify HEAD >/dev/null; then + if [ -n "$short_sha" ]; then git diff-index --cached --quiet HEAD -- || i="+" else i="#" |