diff options
| author | Jeff King <peff@peff.net> | 2013-10-25 02:54:06 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-10-25 14:54:18 -0700 |
| commit | b3e9ce13320f62e07fcb88a5cdf3c0462c195e95 (patch) | |
| tree | 435fdf70b5ae07e3ec5bde5fc984a1fd7a24ece9 /t/t7106-reset-unborn-branch.sh | |
| parent | 954312a3ff76652a954b730ae69a031f98293a99 (diff) | |
| download | git-b3e9ce13320f62e07fcb88a5cdf3c0462c195e95.tar.gz | |
reset: pass real rev name to add--interactivejk/reset-p-current-head-fix
The add--interactive --patch mode adjusts the UI based on
whether we are pulling changes from HEAD or elsewhere (in
the former case it asks to unstage the reverse hunk, rather
than apply the forward hunk).
Commit 166ec2e taught reset to work on an unborn branch, but
in doing so, switched to always providing add--interactive
with the sha1 rather than the symbolic name. This meant we
always used the "apply" interface, even for "git reset -p
HEAD".
We can fix this by passing the symbolic name to
add--interactive. Since it understands unborn branches
these days, we do not even have to cover this special case
ourselves; we can simply pass HEAD.
The tests in t7105 now check that the right interface is
used in each circumstance (and notice the regression from
166ec2e we are fixing). The test in t7106 checks that we
get this right for the unborn case, too (not a regression,
since it didn't work at all before, but a nice improvement).
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t7106-reset-unborn-branch.sh')
| -rwxr-xr-x | t/t7106-reset-unborn-branch.sh | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/t/t7106-reset-unborn-branch.sh b/t/t7106-reset-unborn-branch.sh index af00ab4d88..0f95f00477 100755 --- a/t/t7106-reset-unborn-branch.sh +++ b/t/t7106-reset-unborn-branch.sh @@ -37,11 +37,12 @@ test_expect_success PERL 'reset -p' ' rm .git/index && git add a && echo y >yes && - git reset -p <yes && + git reset -p <yes >output && >expect && git ls-files >actual && - test_cmp expect actual + test_cmp expect actual && + test_i18ngrep "Unstage" output ' test_expect_success 'reset --soft is a no-op' ' |