[PATCH v2 1/2] Teach reset the same short-hand as checkout

[PATCH v2 1/2] Teach reset the same short-hand as checkout

[Sudhanshu Shekhar]

"-" now means the previous branch.

Signed-off-by: Sudhanshu Shekhar <sudshekhar02@gmail.com>
Thanks-to: Eric Sunshine, Junio C Hamano, Matthieu Moy
---
 builtin/reset.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/builtin/reset.c b/builtin/reset.c
index 4c08ddc..02f33ef 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], "--")) {
@@ -225,12 +230,14 @@ static void parse_args(struct pathspec *pathspec,
 			verify_non_filename(prefix, argv[0]);
 			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.168.g0c82976.dirty

[PATCH v2 2/2] Added test cases for git reset -

[Sudhanshu Shekhar]

1) Confirm error message when git reset is used with no previous branch
2) Confirm git reset - works like git reset @{-1}
3) Confirm "-" is always treated as a commit unless the -- file option
is specified

Signed-off-by: Sudhanshu Shekhar<sudshekhar02@gmail.com>
Thanks-to: David Aguilar<davvid@gmail.com>
---
David, thank you for your remarks. I have tried to incorporate your suggestions into this patch.
Please let me know if I have missed out on anything else.

 t/t7102-reset.sh | 121 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 121 insertions(+)

diff --git a/t/t7102-reset.sh b/t/t7102-reset.sh
index 98bcfe2..fe43f64 100755
--- a/t/t7102-reset.sh
+++ b/t/t7102-reset.sh
@@ -568,4 +568,125 @@ test_expect_success 'reset --mixed sets up work tree' '
 	test_cmp expect actual
 '
 
+cat >expect <<EOF
+fatal: bad flag '-' used after filename
+EOF
+
+test_expect_success 'reset - with no previous branch' '
+	git init no_previous --quiet &&
+	(
+		cd no_previous &&
+		test_must_fail git reset - 2>output
+	) &&
+	test_cmp expect no_previous/output
+'
+
+test_expect_success 'reset - while having file named - and no previous branch' '
+	git init no_previous --quiet &&
+	(
+		cd no_previous &&
+		touch ./- &&
+		test_must_fail git reset - 2>output
+	) &&
+	test_cmp expect no_previous/output
+'
+
+cat >expect <<EOF
+Unstaged changes after reset:
+M	-
+M	1
+EOF
+
+test_expect_success 'reset - in the prescence of file named - with previous branch' '
+	git init no_previous --quiet &&
+	(
+		cd no_previous &&
+		touch ./- 1 &&
+		git add 1 - &&
+		git commit -m "add base files" &&
+		git checkout -b new_branch &&
+		echo "random" >./- &&
+		echo "wow" >1 &&
+		git add 1 - &&
+		git reset - >../output
+	) &&
+	rm -rf no_previous &&
+	test_cmp output expect
+'
+test_expect_success 'reset - in the presence of file named - with -- option' '
+	git init no_previous --quiet &&
+	(
+		cd no_previous &&
+		touch ./- 1 &&
+		git add 1 - &&
+		git commit -m "add base files" &&
+		git checkout -b new_branch &&
+		echo "random" >./- &&
+		echo "wow" >1 &&
+		git add 1 - &&
+		git reset - -- >../output
+	) &&
+	rm -rf no_previous &&
+	test_cmp output expect
+'
+
+cat >expect <<EOF
+Unstaged changes after reset:
+M	-
+EOF
+
+test_expect_success 'reset - in the presence of file named - with -- file option' '
+	git init no_previous --quiet &&
+	(
+		cd no_previous &&
+		touch ./- 1 &&
+		git add 1 - &&
+		git commit -m "add base files" &&
+		git checkout -b new_branch &&
+		echo "random" >./- &&
+		echo "wow" >1 &&
+		git add 1 - &&
+		git reset -- - >../output
+	) &&
+	rm -rf no_previous
+	test_cmp output expect
+'
+test_expect_success 'reset - in the presence of file named - with both pre and post -- option' '
+	git init no_previous --quiet &&
+	(
+		cd no_previous &&
+		touch ./- 1 &&
+		git add 1 - &&
+		git commit -m "add base files" &&
+		git checkout -b new_branch &&
+		echo "random" >./- &&
+		echo "wow" >1 &&
+		git add 1 - &&
+		git reset - -- - >../output
+	) &&
+	rm -rf no_previous
+	test_cmp output expect
+'
+
+test_expect_success 'reset - works same as reset @{-1}' '
+	git init no_previous --quiet &&
+	(
+		cd no_previous &&
+		echo "random" >random &&
+		git add random &&
+		git commit -m "base commit" &&
+		git checkout -b temp &&
+		echo new-file >new-file &&
+		git add new-file &&
+		git commit -m "added new-file" &&
+		git reset - &&
+		git status --porcelain >../first &&
+		git add new-file &&
+		git commit -m "added new-file" &&
+		git reset @{-1} &&
+		git status --porcelain >../second
+	) &&
+	test_cmp first second
+'
+
 test_done
-- 
2.3.1.168.g0c82976.dirty

Re: [PATCH v2 1/2] Teach reset the same short-hand as checkout

[Junio C Hamano]

Sudhanshu Shekhar <sudshekhar02@gmail.com> writes:

> "-" now means the previous branch.
>
> Signed-off-by: Sudhanshu Shekhar <sudshekhar02@gmail.com>
> Thanks-to: Eric Sunshine, Junio C Hamano, Matthieu Moy
> ---


These look unusual for a few reasons: your S-o-b should be at the
end, we usually say Helped-by: instead, and we do not use these with
multiple names on a single line.

Please do not try to be original without a good reason.  We may
start counting the number of times people appear on these footers to
see how much contribution those who do not directly author commits
(read: those who mentor others) are making.

>  builtin/reset.c | 9 ++++++++-
>  1 file changed, 8 insertions(+), 1 deletion(-)

The comment I gave in the thread that ends at $gmane/265112 would
apply equally to this patch, I think.

cf. http://thread.gmane.org/gmane.comp.version-control.git/264986/focus=265112

Re: [PATCH v2 1/2] Teach reset the same short-hand as checkout

[Sudhanshu Shekhar]

Hi,

On Tue, Mar 10, 2015 at 8:04 AM, Junio C Hamano <gitster@pobox.com> wrote:
> Sudhanshu Shekhar <sudshekhar02@gmail.com> writes:
>
>> "-" now means the previous branch.
>>
>> Signed-off-by: Sudhanshu Shekhar <sudshekhar02@gmail.com>
>> Thanks-to: Eric Sunshine, Junio C Hamano, Matthieu Moy
>> ---
>
>
> These look unusual for a few reasons: your S-o-b should be at the
> end, we usually say Helped-by: instead, and we do not use these with
> multiple names on a single line.
>
> Please do not try to be original without a good reason.  We may
> start counting the number of times people appear on these footers to
> see how much contribution those who do not directly author commits
> (read: those who mentor others) are making.

Thank you for telling me this. I will it keep it in mind from next
time onwards.

>
>>  builtin/reset.c | 9 ++++++++-
>>  1 file changed, 8 insertions(+), 1 deletion(-)
>
> The comment I gave in the thread that ends at $gmane/265112 would
> apply equally to this patch, I think.
>
> cf. http://thread.gmane.org/gmane.comp.version-control.git/264986/focus=265112
I have rectified this in my new patch and will send it soon.
Kindly do let me know if there are any other changes required.

Thank you.
Regards,
Sudhanshu