'git reset -' will reset to the previous branch. It will behave similar
to @{-1} except when a file named '@{-1}' is present. To refer to a file
named '-', use ./- or the -- flag.
Helped-by: Junio C Hamano <gitster@xxxxxxxxx>
Helped-by: Eric Sunshine <sunshine@xxxxxxxxxxxxxx>
Helped-by: Matthieu Moy <Matthieu.Moy@xxxxxxxxxxxxxxx>
Signed-off-by: Sudhanshu Shekhar <sudshekhar02@xxxxxxxxx>
---
Thank you all for your feedback. I have made changes and I hope this patch meets community standards. Please let me know if any further changes are required.
Regards,
Sudhanshu
builtin/reset.c | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/builtin/reset.c b/builtin/reset.c
index 4c08ddc..8abd300 100644
--- a/builtin/reset.c
+++ b/builtin/reset.c
@@ -192,6 +192,7 @@ static void parse_args(struct pathspec *pathspec,
{
const char *rev = "HEAD";
unsigned char unused[20];
+ int substituted_minus = 0;
/*
* Possible arguments are:
*
@@ -205,6 +206,10 @@ static void parse_args(struct pathspec *pathspec,
*/
if (argv[0]) {
+ if (!strcmp(argv[0], "-")) {
+ argv[0] = "@{-1}";
+ substituted_minus = 1;
+ }
if (!strcmp(argv[0], "--")) {
argv++; /* reset to HEAD, possibly with paths */
} else if (argv[1] && !strcmp(argv[1], "--")) {
@@ -222,15 +227,21 @@ static void parse_args(struct pathspec *pathspec,
* Ok, argv[0] looks like a commit/tree; it should not
* be a filename.
*/
+ if (substituted_minus)
+ argv[0] = "-";
verify_non_filename(prefix, argv[0]);
+ if (substituted_minus)
+ argv[0] = "@{-1}";
rev = *argv++;
} else {
+ /* We were treating "-" as a commit and not a file */
+ if (substituted_minus)
+ argv[0] = "-";
/* Otherwise we treat this as a filename */
verify_filename(prefix, argv[0], 1);
}
}
*rev_ret = rev;
-
if (read_cache() < 0)
die(_("index file corrupt"));
--
2.3.1.279.gd534259
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html