Re* Bug report: reset -p HEAD
flat view
From: Junio C Hamano <hidden>
Date: 2016-06-15 22:59:05
Subsystem:
the rest · Maintainer:
Linus Torvalds
Possibly related (same subject, not in this thread)
- 2016-06-15 · Re: Re* Bug report: reset -p HEAD · Junio C Hamano <hidden>
Maarten de Vries [off-list ref] writes:
Some more info: It used to work as intended. Using a bisect shows it has been broken by commit 166ec2e9.
Thanks. A knee-jerk change without thinking what side-effect it has for you to try out. builtin/reset.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/builtin/reset.c b/builtin/reset.c
index f2f9d55..a3088d9 100644
--- a/builtin/reset.c
+++ b/builtin/reset.c@@ -304,7 +304,10 @@ 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( + (unborn || strcmp(rev, "HEAD")) + ? sha1_to_hex(sha1) + : "HEAD", "--patch=reset", &pathspec); } /* git reset tree [--] paths... can be used to