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 specifiedSigned-off-by: Sudhanshu Shekhar<[email protected]> Thanks-to: David Aguilar<[email protected]> --- 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 -- 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
