X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft6200-fmt-merge-msg.sh;h=526d7d1c4422e342c7257e260626dac3dda36a3a;hb=bc9c3e0b932c5e14de749e07f5045197e7d6cd76;hp=63e49f310cdc0bf99cb1578c29f2a3da4059da75;hpb=67e31d6234c0332334d7aedd70b2f101bc010cf9;p=git.git

diff --git a/t/t6200-fmt-merge-msg.sh b/t/t6200-fmt-merge-msg.sh
index 63e49f310..bc7434941 100755
--- a/t/t6200-fmt-merge-msg.sh
+++ b/t/t6200-fmt-merge-msg.sh
@@ -79,20 +79,20 @@ test_expect_success 'merge-msg test #1' '
 	git fetch . left &&
 
 	git fmt-merge-msg <.git/FETCH_HEAD >actual &&
-	diff -u actual expected
+	test_cmp expected actual
 '
 
-cat >expected <<\EOF
-Merge branch 'left' of ../trash
+cat >expected <<EOF
+Merge branch 'left' of ../$test
 EOF
 
 test_expect_success 'merge-msg test #2' '
 
 	git checkout master &&
-	git fetch ../trash left &&
+	git fetch ../"$test" left &&
 
 	git fmt-merge-msg <.git/FETCH_HEAD >actual &&
-	diff -u actual expected
+	test_cmp expected actual
 '
 
 cat >expected <<\EOF
@@ -106,16 +106,32 @@ Merge branch 'left'
   Common #1
 EOF
 
-test_expect_success 'merge-msg test #3' '
+test_expect_success 'merge-msg test #3-1' '
+
+	git config --unset-all merge.log
+	git config --unset-all merge.summary
+	git config merge.log true &&
+
+	git checkout master &&
+	setdate &&
+	git fetch . left &&
+
+	git fmt-merge-msg <.git/FETCH_HEAD >actual &&
+	test_cmp expected actual
+'
 
-	git repo-config merge.summary true &&
+test_expect_success 'merge-msg test #3-2' '
+
+	git config --unset-all merge.log
+	git config --unset-all merge.summary
+	git config merge.summary true &&
 
 	git checkout master &&
 	setdate &&
 	git fetch . left &&
 
 	git fmt-merge-msg <.git/FETCH_HEAD >actual &&
-	diff -u actual expected
+	test_cmp expected actual
 '
 
 cat >expected <<\EOF
@@ -136,28 +152,60 @@ Merge branches 'left' and 'right'
   Common #1
 EOF
 
-test_expect_success 'merge-msg test #4' '
+test_expect_success 'merge-msg test #4-1' '
+
+	git config --unset-all merge.log
+	git config --unset-all merge.summary
+	git config merge.log true &&
+
+	git checkout master &&
+	setdate &&
+	git fetch . left right &&
+
+	git fmt-merge-msg <.git/FETCH_HEAD >actual &&
+	test_cmp expected actual
+'
+
+test_expect_success 'merge-msg test #4-2' '
+
+	git config --unset-all merge.log
+	git config --unset-all merge.summary
+	git config merge.summary true &&
+
+	git checkout master &&
+	setdate &&
+	git fetch . left right &&
+
+	git fmt-merge-msg <.git/FETCH_HEAD >actual &&
+	test_cmp expected actual
+'
+
+test_expect_success 'merge-msg test #5-1' '
 
-	git repo-config merge.summary true &&
+	git config --unset-all merge.log
+	git config --unset-all merge.summary
+	git config merge.log yes &&
 
 	git checkout master &&
 	setdate &&
 	git fetch . left right &&
 
 	git fmt-merge-msg <.git/FETCH_HEAD >actual &&
-	diff -u actual expected
+	test_cmp expected actual
 '
 
-test_expect_success 'merge-msg test #5' '
+test_expect_success 'merge-msg test #5-2' '
 
-	git repo-config merge.summary yes &&
+	git config --unset-all merge.log
+	git config --unset-all merge.summary
+	git config merge.summary yes &&
 
 	git checkout master &&
 	setdate &&
 	git fetch . left right &&
 
 	git fmt-merge-msg <.git/FETCH_HEAD >actual &&
-	diff -u actual expected
+	test_cmp expected actual
 '
 
 test_done