[RFC/PATCH 09/18] Add testcase for --index-only merges with the ours strategy

From

Elijah Newren <newren@gmail.com>

Date

Apr 8, 2016, 06:58 UTC

Message-ID

<1460098726-5958-10-git-send-email-newren@gmail.com>

In-Reply-To

<1460098726-5958-1-git-send-email-newren@gmail.com>

Signed-off-by: Elijah Newren <newren@gmail.com>
---
 t/t6043-merge-index-only.sh | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/t/t6043-merge-index-only.sh b/t/t6043-merge-index-only.sh
index b01bf79..84c6640 100755
--- a/t/t6043-merge-index-only.sh
+++ b/t/t6043-merge-index-only.sh
@@ -374,4 +374,36 @@ test_expect_failure '--index-only octopus, bare' '
 	)
 '
 
+test_expect_failure '--index-only ours, non-bare' '
+	git reset --hard &&
+	git checkout B^0 &&
+
+	git merge --index-only -s ours C^0 &&
+
+	test "$(git rev-list --count HEAD)" -eq 4 &&
+	test $(git rev-parse :a) = $(git rev-parse B:a) &&
+	test $(git rev-parse :b) = $(git rev-parse B:b) &&
+	test_must_fail git rev-parse :c &&
+	test ! -f c
+'
+
+test_expect_failure '--index-only ours, bare' '
+	rm -rf bare.clone &&
+	git clone --bare . bare.clone &&
+	(cd bare.clone &&
+
+	 git update-ref --no-deref HEAD B &&
+	 git read-tree HEAD &&
+
+	 git merge --index-only -s ours C^0 &&
+
+	 test "$(git rev-list --count HEAD)" -eq 4 &&
+	 test $(git rev-parse :a) = $(git rev-parse B:a) &&
+	 test $(git rev-parse :b) = $(git rev-parse B:b) &&
+	 test_must_fail git rev-parse :c &&
+	 test ! -f a &&
+	 test ! -f c
+	)
+'
+
 test_done

-- 
2.8.0.18.gc685494