[PATCH v4 1/6] reset: add a few tests for "git reset --merge"
From: Christian Couder <hidden>
Date: 2016-06-15 22:47:51
Subsystem:
the rest · Maintainer:
Linus Torvalds
Commit 9e8eceab ("Add 'merge' mode to 'git reset'", 2008-12-01),
added the --merge option to git reset, but there were no test cases
for it.
This was not a big problem because "git reset" was just forking and
execing "git read-tree", but this will change in a following patch.
So let's add a few test cases to make sure that there will be no
regression.
Signed-off-by: Christian Couder <redacted>
---
t/t7110-reset-merge.sh | 94 ++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 94 insertions(+), 0 deletions(-)
create mode 100755 t/t7110-reset-merge.sh
diff --git a/t/t7110-reset-merge.sh b/t/t7110-reset-merge.sh
new file mode 100755
index 0000000..8190da1
--- /dev/null
+++ b/t/t7110-reset-merge.sh@@ -0,0 +1,94 @@ +#!/bin/sh +# +# Copyright (c) 2009 Christian Couder +# + +test_description='Tests for "git reset --merge"' + +. ./test-lib.sh + +test_expect_success 'creating initial files' ' + echo "line 1" >> file1 && + echo "line 2" >> file1 && + echo "line 3" >> file1 && + cp file1 file2 && + git add file1 file2 && + test_tick && + git commit -m "Initial commit" +' + +test_expect_success 'reset --merge is ok with changes in file it does not touch' ' + echo "line 4" >> file1 && + echo "line 4" >> file2 && + test_tick && + git commit -m "add line 4" file1 && + git reset --merge HEAD^ && + ! grep 4 file1 && + grep 4 file2 && + git reset --merge HEAD@{1} && + grep 4 file1 && + grep 4 file2 +' + +test_expect_success 'reset --merge discards changes added to index (1)' ' + echo "line 5" >> file1 && + git add file1 && + git reset --merge HEAD^ && + ! grep 4 file1 && + ! grep 5 file1 && + grep 4 file2 && + echo "line 5" >> file2 && + git add file2 && + git reset --merge HEAD@{1} && + ! grep 4 file2 && + ! grep 5 file1 && + grep 4 file1 +' + +test_expect_success 'reset --merge discards changes added to index (2)' ' + echo "line 4" >> file2 && + git add file2 && + git reset --merge HEAD^ && + ! grep 4 file2 && + git reset --merge HEAD@{1} && + ! grep 4 file2 && + grep 4 file1 +' + +test_expect_success 'reset --merge fails with changes in file it touches' ' + echo "line 5" >> file1 && + test_tick && + git commit -m "add line 5" file1 && + sed -e "s/line 1/changed line 1/" <file1 >file3 && + mv file3 file1 && + test_must_fail git reset --merge HEAD^ 2>err.log && + grep file1 err.log | grep "not uptodate" && + git reset --hard HEAD^ +' + +test_expect_success 'setup 2 different branches' ' + git branch branch1 && + git branch branch2 && + git checkout branch1 && + echo "line 5 in branch1" >> file1 && + test_tick && + git commit -a -m "change in branch1" && + git checkout branch2 && + echo "line 5 in branch2" >> file1 && + test_tick && + git commit -a -m "change in branch2" +' + +test_expect_success '"reset --merge HEAD^" fails with pending merge' ' + test_must_fail git merge branch1 && + test_must_fail git reset --merge HEAD^ && + git reset --hard HEAD +' + +test_expect_success '"reset --merge HEAD" fails with pending merge' ' + test_must_fail git merge branch1 && + test_must_fail git reset --merge HEAD && + git reset --hard HEAD +' + +test_done
--
1.6.5.1.gaf97d