mirror/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-09-28 13:33:31 +02:00
Code

reset: pass real rev name to add--interactive

Browse Source 
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>
This commit is contained in:
Jeff King 2013-10-25 02:54:06 -04:00 committed by Junio C Hamano
parent 954312a3ff
commit b3e9ce1332
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builtin/reset.c
View File

@ -304,7 +304,7 @@ int cmd_reset(int argc, const char **argv, const char *prefix)
if (patch_mode) {
if (reset_type != NONE)
die(_("--patch is incompatible with --{hard,mixed,soft}"));
return run_add_interactive(sha1_to_hex(sha1), "--patch=reset", &pathspec);
return run_add_interactive(rev, "--patch=reset", &pathspec);
}
/* git reset tree [--] paths... can be used to

10
t/t7105-reset-patch.sh
View File

@ -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'

5
t/t7106-reset-unborn-branch.sh
View File

@ -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' '