diff options
| author | SZEDER Gábor <szeder@ira.uka.de> | 2015-11-21 11:30:09 (GMT) |
|---|---|---|
| committer | Jeff King <peff@peff.net> | 2015-11-24 20:27:01 (GMT) |
| commit | c26f70ceb3960603a78010c87f8ad11820ab6561 (patch) | |
| tree | 7d7b8837f661e2fff1170ed1121c4c14955a0235 | |
| parent | 0af9f7ecb8648ab1c6a090913e3df4a39f7c6754 (diff) | |
| download | git-c26f70ceb3960603a78010c87f8ad11820ab6561.zip git-c26f70ceb3960603a78010c87f8ad11820ab6561.tar.gz git-c26f70ceb3960603a78010c87f8ad11820ab6561.tar.bz2 | |
bash prompt: indicate dirty index even on orphan branches
__git_ps1() doesn't indicate dirty index while on an orphan branch.
To check the dirtiness of the index, __git_ps1() runs 'git diff-index
--cached ... HEAD', which doesn't work on an orphan branch,
because HEAD doesn't point to a valid commit.
Run 'git diff ... --cached' instead, as it does the right thing both
on valid and invalid HEAD, i.e. compares the index to the existing
HEAD in the former case and to the empty tree in the latter. This
fixes the two failing tests added in the first commit of this series.
The dirtiness of the worktree is already checked with 'git diff' and
is displayed correctly even on an orphan branch.
Signed-off-by: SZEDER Gábor <szeder@ira.uka.de>
Signed-off-by: Jeff King <peff@peff.net>
| -rw-r--r-- | contrib/completion/git-prompt.sh | 5 | ||||
| -rwxr-xr-x | t/t9903-bash-prompt.sh | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/contrib/completion/git-prompt.sh b/contrib/completion/git-prompt.sh index 7a95fbd..64219e6 100644 --- a/contrib/completion/git-prompt.sh +++ b/contrib/completion/git-prompt.sh @@ -477,9 +477,8 @@ __git_ps1 () [ "$(git config --bool bash.showDirtyState)" != "false" ] then git diff --no-ext-diff --quiet || w="*" - if [ -n "$short_sha" ]; then - git diff-index --cached --quiet HEAD -- || i="+" - else + git diff --no-ext-diff --cached --quiet || i="+" + if [ -z "$short_sha" ] && [ -z "$i" ]; then i="#" fi fi diff --git a/t/t9903-bash-prompt.sh b/t/t9903-bash-prompt.sh index 2c9d1f9..af82049 100755 --- a/t/t9903-bash-prompt.sh +++ b/t/t9903-bash-prompt.sh @@ -285,7 +285,7 @@ test_expect_success 'prompt - dirty status indicator - orphan branch - clean' ' test_cmp expected "$actual" ' -test_expect_failure 'prompt - dirty status indicator - orphan branch - dirty index' ' +test_expect_success 'prompt - dirty status indicator - orphan branch - dirty index' ' printf " (orphan +)" >expected && test_when_finished "git checkout master" && git checkout --orphan orphan && @@ -296,7 +296,7 @@ test_expect_failure 'prompt - dirty status indicator - orphan branch - dirty ind test_cmp expected "$actual" ' -test_expect_failure 'prompt - dirty status indicator - orphan branch - dirty index and worktree' ' +test_expect_success 'prompt - dirty status indicator - orphan branch - dirty index and worktree' ' printf " (orphan *+)" >expected && test_when_finished "git checkout master" && git checkout --orphan orphan && |