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

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 <>
 builtin/reset.c                |  2 +-
 t/         | 10 ++++++----
 t/ |  5 +++--
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/builtin/reset.c b/builtin/reset.c
index f2f9d55..6004803 100644
--- a/builtin/reset.c
+++ b/builtin/reset.c
@@ -304,7 +304,7 @@ int cmd_reset(int argc, const char **argv, const char 
        if (patch_mode) {
                if (reset_type != NONE)
                        die(_("--patch is incompatible with 
-               return run_add_interactive(sha1_to_hex(sha1), "--patch=reset", 
+               return run_add_interactive(rev, "--patch=reset", &pathspec);
        /* git reset tree [--] paths... can be used to
diff --git a/t/ b/t/
index 95fab20..98b7d7b 100755
--- a/t/
+++ b/t/
@@ -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'
diff --git a/t/ b/t/
index af00ab4..0f95f00 100755
--- a/t/
+++ b/t/
@@ -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' '
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to
More majordomo info at

Reply via email to