From: Sudhanshu Shekhar <sudshekhar02@gmail.com>
To: git@vger.kernel.org
Cc: Matthieu.Moy@grenoble-inp.fr, gitster@pobox.com,
Sudhanshu Shekhar <sudshekhar02@gmail.com>
Subject: [PATCH 2/2] Added test cases for git reset -
Date: Sun, 8 Mar 2015 20:28:40 +0530 [thread overview]
Message-ID: <1425826720-5899-2-git-send-email-sudshekhar02@gmail.com> (raw)
In-Reply-To: <1425826720-5899-1-git-send-email-sudshekhar02@gmail.com>
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 <sudshekhar02@gmail.com>
---
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
next prev parent reply other threads:[~2015-03-08 14:59 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-03 20:51 [PATCH] reset: allow "-" short hand for previous commit Sudhanshu Shekhar
2015-03-03 22:10 ` Matthieu Moy
2015-03-03 23:17 ` Junio C Hamano
2015-03-04 7:07 ` Sudhanshu Shekhar
2015-03-04 7:09 ` Sudhanshu Shekhar
2015-03-04 7:10 ` Eric Sunshine
2015-03-05 0:34 ` Junio C Hamano
2015-03-07 21:04 ` [PATCH 1/2] " Sudhanshu Shekhar
2015-03-08 10:33 ` Matthieu Moy
2015-03-08 14:58 ` [PATCH 1/2] Teach reset the same short-hand as checkout Sudhanshu Shekhar
2015-03-08 14:58 ` Sudhanshu Shekhar [this message]
2015-03-08 18:09 ` [PATCH 2/2] Added test cases for git reset - David Aguilar
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1425826720-5899-2-git-send-email-sudshekhar02@gmail.com \
--to=sudshekhar02@gmail.com \
--cc=Matthieu.Moy@grenoble-inp.fr \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).