[PATCH 18/23] tests --conflicted.

From

Jon Seymour <jon.seymour@gmail.com>

Date

Apr 23, 2011, 07:22 UTC

Message-ID

<1303543372-77843-19-git-send-email-jon.seymour@gmail.com>

In-Reply-To

<1303543372-77843-1-git-send-email-jon.seymour@gmail.com>

---
 t/t1520-test.sh |   26 ++++++++++++++++++++++++++
 1 files changed, 26 insertions(+), 0 deletions(-)

diff --git a/t/t1520-test.sh b/t/t1520-test.sh
index ddca519..a18c1d7 100755
--- a/t/t1520-test.sh
+++ b/t/t1520-test.sh
@@ -442,4 +442,30 @@ test_expect_success 'existence' \
        --not-branch-exists A 
 '
 
+test_expect_success 'git test --conflicted # should fail' \
+'
+	test_must_fail git test --conflicted
+'
+
+test_expect_success 'git test --not-conflicted' \
+'
+	git test --not-conflicted
+'
+
+test_expect_success 'git test --conflicted' \
+'
+	test_when_finished "git reset --hard HEAD" && 
+        ! git merge F &&
+	git test --conflicted 
+	
+'
+
+test_expect_success 'git test --not-conflicted # should fail when there are conflcted files' \
+'
+	test_when_finished "git reset --hard HEAD" && 
+        ! git merge F &&
+	test_must_fail git test --not-conflicted 
+	
+'
+
 test_done

-- 
1.7.5.rc1.23.g7f622