diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-11-01 07:38:49 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-11-01 07:38:49 -0700 |
| commit | 1feb458fb956cc8991267b00f33b91766dfadaad (patch) | |
| tree | 7447c3c6b26275919de285a1ee9ce44d14dbf85f /t/t7105-reset-patch.sh | |
| parent | Merge branch 'jk/pack-corruption-post-mortem' (diff) | |
| parent | reset: pass real rev name to add--interactive (diff) | |
| download | tgif-1feb458fb956cc8991267b00f33b91766dfadaad.tar.xz | |
Merge branch 'jk/reset-p-current-head-fix'
"git reset -p HEAD" has codepath to special case it from resetting
to contents of other commits, but recent change broke it.
* jk/reset-p-current-head-fix:
reset: pass real rev name to add--interactive
add-interactive: handle unborn branch in patch mode
Diffstat (limited to 't/t7105-reset-patch.sh')
| -rwxr-xr-x | t/t7105-reset-patch.sh | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/t/t7105-reset-patch.sh b/t/t7105-reset-patch.sh index 95fab20361..98b7d7b969 100755 --- a/t/t7105-reset-patch.sh +++ b/t/t7105-reset-patch.sh @@ -25,15 +25,17 @@ test_expect_success PERL 'saying "n" does nothing' ' ' test_expect_success PERL 'git reset -p' ' - (echo n; echo y) | git reset -p && + (echo n; echo y) | git reset -p >output && verify_state dir/foo work head && - verify_saved_state bar + verify_saved_state bar && + test_i18ngrep "Unstage" output ' test_expect_success PERL 'git reset -p HEAD^' ' - (echo n; echo y) | git reset -p HEAD^ && + (echo n; echo y) | git reset -p HEAD^ >output && verify_state dir/foo work parent && - verify_saved_state bar + verify_saved_state bar && + test_i18ngrep "Apply" output ' # The idea in the rest is that bar sorts first, so we always say 'y' |