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 /builtin | |
| parent | 60e779adaa5f037307c762c8c353e68815d1c018 (diff) | |
| parent | b3e9ce13320f62e07fcb88a5cdf3c0462c195e95 (diff) | |
| download | git-1feb458fb956cc8991267b00f33b91766dfadaad.tar.gz | |
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 'builtin')
| -rw-r--r-- | builtin/reset.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/reset.c b/builtin/reset.c index f2f9d55392..60048030dd 100644 --- a/builtin/reset.c +++ b/builtin/reset.c @@ -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 |