Four test cases have been added
1) when user does reset - without any previous branch => Leads to error
2) when user does reset - with a previous branch => Ensure it
behaves like <at> {-1}
Other two deal with the situation when we have a file named '-'. We
ignore such a file and - is always treated either as a previous branch
or a bad filename. Users who wish to reset a file named '-' should
specify
it as './-'
Signed-off-by: Sudhanshu Shekhar <[email protected]>
---
I have created test cases for git reset -. @Junio, I tried incorporating your
suggestions while developing these test cases.
However, since the verify_filename function ignores files starting with "-",
git reset - will always refer to the branch only. Kindly let me know your
thoughts and views on this and also your reviews about the test cases I have
created.
Regards,
Sudhanshu
t/t7102-reset.sh | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 62 insertions(+)
diff --git a/t/t7102-reset.sh b/t/t7102-reset.sh
index 98bcfe2..ade3d6a 100755
--- a/t/t7102-reset.sh
+++ b/t/t7102-reset.sh
@@ -568,4 +568,66 @@ 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 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 output
+'
+
+cat > expect << EOF
+Unstaged changes after reset:
+M -
+M 1
+EOF
+
+test_expect_success 'reset - in the prescence of file named - with previou
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 &&
+ 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 >../first &&
+ git add new-file &&
+ git commit -m "added new-file" &&
+ git reset @{-1} &&
+ git status >../second &&
+ test_cmp ../first ../second
+'
+
test_done
--
2.3.1.168.g0c82976.dirty
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
