diff options
author | Junio C Hamano <gitster@pobox.com> | 2015-12-08 22:05:02 (GMT) |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2015-12-08 22:05:02 (GMT) |
commit | e6ed5a438c7a5436a08c08e269174d9975f8dc1d (patch) | |
tree | 52abb467a39f163dbb103c2e0ca47da4d5320e9b /t | |
parent | 22386ad6ee427453588936f872d6e0d8dd6cf751 (diff) | |
parent | c26f70ceb3960603a78010c87f8ad11820ab6561 (diff) | |
download | git-e6ed5a438c7a5436a08c08e269174d9975f8dc1d.zip git-e6ed5a438c7a5436a08c08e269174d9975f8dc1d.tar.gz git-e6ed5a438c7a5436a08c08e269174d9975f8dc1d.tar.bz2 |
Merge branch 'sg/bash-prompt-dirty-orphan' into maint
Produce correct "dirty" marker for shell prompts, even when we
are on an orphan or an unborn branch.
* sg/bash-prompt-dirty-orphan:
bash prompt: indicate dirty index even on orphan branches
bash prompt: remove a redundant 'git diff' option
bash prompt: test dirty index and worktree while on an orphan branch
Diffstat (limited to 't')
-rwxr-xr-x | t/t9903-bash-prompt.sh | 31 |
1 files changed, 28 insertions, 3 deletions
diff --git a/t/t9903-bash-prompt.sh b/t/t9903-bash-prompt.sh index 6b68777..af82049 100755 --- a/t/t9903-bash-prompt.sh +++ b/t/t9903-bash-prompt.sh @@ -273,11 +273,36 @@ test_expect_success 'prompt - dirty status indicator - dirty index and worktree' test_cmp expected "$actual" ' -test_expect_success 'prompt - dirty status indicator - before root commit' ' - printf " (master #)" >expected && +test_expect_success 'prompt - dirty status indicator - orphan branch - clean' ' + printf " (orphan #)" >expected && + test_when_finished "git checkout master" && + git checkout --orphan orphan && + git reset --hard && + ( + GIT_PS1_SHOWDIRTYSTATE=y && + __git_ps1 >"$actual" + ) && + test_cmp expected "$actual" +' + +test_expect_success 'prompt - dirty status indicator - orphan branch - dirty index' ' + printf " (orphan +)" >expected && + test_when_finished "git checkout master" && + git checkout --orphan orphan && + ( + GIT_PS1_SHOWDIRTYSTATE=y && + __git_ps1 >"$actual" + ) && + test_cmp expected "$actual" +' + +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 && + >file && ( GIT_PS1_SHOWDIRTYSTATE=y && - cd otherrepo && __git_ps1 >"$actual" ) && test_cmp expected "$actual" |