[PATCH v3 2/2] Added tests for reset -

[Sudhanshu Shekhar <sudshekhar02@gmail.com>]

Added the following test cases:
    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
    4) Confirm "git reset -" works normally even when a file named @{-1} is
    present

Helped-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Sudhanshu Shekhar <sudshekhar02@gmail.com>
---
I have tried to keep each test self sufficient. Please let me know if any changes are required.
Thank you!

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

diff --git a/t/t7102-reset.sh b/t/t7102-reset.sh
index 98bcfe2..0faf241 100755
--- a/t/t7102-reset.sh
+++ b/t/t7102-reset.sh
@@ -568,4 +568,143 @@ test_expect_success 'reset --mixed sets up work tree' '
 	test_cmp expect actual
 '
 
+test_expect_success 'reset - with no previous branch' '
+	git init no_previous &&
+	(
+		cd no_previous &&
+		test_must_fail git reset - 2>output
+	) &&
+	test_i18ngrep "bad flag" no_previous/output
+'
+
+test_expect_success 'reset - while having file named - and no previous branch' '
+	git init no_previous &&
+	(
+		cd no_previous &&
+		>./- &&
+		test_must_fail git reset - 2>output
+	) &&
+	test_i18ngrep "bad flag" no_previous/output
+'
+
+
+test_expect_success 'reset - in the presence of file named - with previous branch' '
+	echo "Unstaged changes after reset:" >expect &&
+	echo "M	-" >>expect &&
+	echo "M	1" >>expect &&
+	git init no_previous &&
+	(
+		cd no_previous &&
+		>./- &&
+		>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' '
+	echo "Unstaged changes after reset:" >expect &&
+	echo "M	-" >>expect &&
+	echo "M	1" >>expect &&
+	git init no_previous &&
+	(
+		cd no_previous &&
+		>./- &&
+		>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 -- file option' '
+	echo "Unstaged changes after reset:" >expect &&
+	echo "M	-" >>expect &&
+	git init no_previous &&
+	(
+		cd no_previous &&
+		>./- &&
+		>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' '
+	echo "Unstaged changes after reset:" >expect &&
+	echo "M	-" >>expect &&
+	git init no_previous &&
+	(
+		cd no_previous &&
+		>./- &&
+		>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 &&
+	(
+		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_expect_success 'reset - with file named @{-1}' '
+	echo "Unstaged changes after reset:" >expect &&
+	echo "M	@{-1}" >>expect &&
+	git init no_previous &&
+	(
+		cd no_previous &&
+		echo "random" >./@{-1} &&
+		git add ./@{-1} &&
+		git commit -m "base commit" &&
+		git checkout -b new_branch &&
+		echo "additional stuff" >>./@{-1} &&
+		git add ./@{-1} &&
+		git reset - >../output
+	) &&
+	rm -rf no_previous &&
+	test_cmp output expect
+'
+
 test_done
-- 
2.3.1.279.gd534259