t6200: use test_config/test_unconfig

The tests were already well protected from previous ones by running
"git config --unset" on variables early they do not want to see, but
it is easier to make sure they start from a clean state by using
more modern test_config/test_unconfig helper functions.

It turns out that the last test depended on the merge.summary
configuration previous one leaves behind.  Set it explicitly in it.

Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/t/t6200-fmt-merge-msg.sh b/t/t6200-fmt-merge-msg.sh
index 992c2a04674d474a8875da955935512ec99f335a..f84bb0c81c4deb0930409da95f1753d9092be685 100755 (executable)
--- a/t/t6200-fmt-merge-msg.sh
+++ b/t/t6200-fmt-merge-msg.sh
@@ -112,8 +112,8 @@ test_expect_success '[merge] summary/log configuration' '
          Common #1
        EOF
 
          Common #1
        EOF
 

-       git config merge.log true &&
-       test_might_fail git config --unset-all merge.summary &&
+       test_config merge.log true &&
+       test_unconfig merge.summary &&

 
        git checkout master &&
        test_tick &&
 
        git checkout master &&
        test_tick &&


@@ -121,8 +121,8 @@ test_expect_success '[merge] summary/log configuration' '
 
        git fmt-merge-msg <.git/FETCH_HEAD >actual1 &&
 
 
        git fmt-merge-msg <.git/FETCH_HEAD >actual1 &&
 

-       test_might_fail git config --unset-all merge.log &&
-       git config merge.summary true &&
+       test_unconfig merge.log &&
+       test_config merge.summary true &&

 
        git checkout master &&
        test_tick &&
 
        git checkout master &&
        test_tick &&


@@ -134,11 +134,6 @@ test_expect_success '[merge] summary/log configuration' '
        test_cmp expected actual2
 '
 
        test_cmp expected actual2
 '
 

-test_expect_success 'setup: clear [merge] configuration' '
-       test_might_fail git config --unset-all merge.log &&
-       test_might_fail git config --unset-all merge.summary
-'
-

 test_expect_success 'setup FETCH_HEAD' '
        git checkout master &&
        test_tick &&
 test_expect_success 'setup FETCH_HEAD' '
        git checkout master &&
        test_tick &&


@@ -248,14 +243,14 @@ test_expect_success 'fmt-merge-msg -m' '
          Common #1
        EOF
 
          Common #1
        EOF
 

-       test_might_fail git config --unset merge.log &&
-       test_might_fail git config --unset merge.summary &&
+       test_unconfig merge.log &&
+       test_unconfig merge.summary &&

        git checkout master &&
        git fetch "$(pwd)" left &&
        git fmt-merge-msg -m "Sync with left" <.git/FETCH_HEAD >actual &&
        git fmt-merge-msg --log -m "Sync with left" \
                                        <.git/FETCH_HEAD >actual.log &&
        git checkout master &&
        git fetch "$(pwd)" left &&
        git fmt-merge-msg -m "Sync with left" <.git/FETCH_HEAD >actual &&
        git fmt-merge-msg --log -m "Sync with left" \
                                        <.git/FETCH_HEAD >actual.log &&

-       git config merge.log true &&
+       test_config merge.log true &&

        git fmt-merge-msg -m "Sync with left" \
                                        <.git/FETCH_HEAD >actual.log-config &&
        git fmt-merge-msg --no-log -m "Sync with left" \
        git fmt-merge-msg -m "Sync with left" \
                                        <.git/FETCH_HEAD >actual.log-config &&
        git fmt-merge-msg --no-log -m "Sync with left" \


@@ -290,29 +285,29 @@ test_expect_success 'setup: expected shortlog for two branches' '
 '
 
 test_expect_success 'shortlog for two branches' '
 '
 
 test_expect_success 'shortlog for two branches' '

-       git config merge.log true &&
-       test_might_fail git config --unset-all merge.summary &&
+       test_config merge.log true &&
+       test_unconfig merge.summary &&

        git checkout master &&
        test_tick &&
        git fetch . left right &&
        git fmt-merge-msg <.git/FETCH_HEAD >actual1 &&
 
        git checkout master &&
        test_tick &&
        git fetch . left right &&
        git fmt-merge-msg <.git/FETCH_HEAD >actual1 &&
 

-       test_might_fail git config --unset-all merge.log &&
-       git config merge.summary true &&
+       test_unconfig merge.log &&
+       test_config merge.summary true &&

        git checkout master &&
        test_tick &&
        git fetch . left right &&
        git fmt-merge-msg <.git/FETCH_HEAD >actual2 &&
 
        git checkout master &&
        test_tick &&
        git fetch . left right &&
        git fmt-merge-msg <.git/FETCH_HEAD >actual2 &&
 

-       git config merge.log yes &&
-       test_might_fail git config --unset-all merge.summary &&
+       test_config merge.log yes &&
+       test_unconfig merge.summary &&

        git checkout master &&
        test_tick &&
        git fetch . left right &&
        git fmt-merge-msg <.git/FETCH_HEAD >actual3 &&
 
        git checkout master &&
        test_tick &&
        git fetch . left right &&
        git fmt-merge-msg <.git/FETCH_HEAD >actual3 &&
 

-       test_might_fail git config --unset-all merge.log &&
-       git config merge.summary yes &&
+       test_unconfig merge.log &&
+       test_config merge.summary yes &&

        git checkout master &&
        test_tick &&
        git fetch . left right &&
        git checkout master &&
        test_tick &&
        git fetch . left right &&


@@ -325,8 +320,8 @@ test_expect_success 'shortlog for two branches' '
 '
 
 test_expect_success 'merge-msg -F' '
 '
 
 test_expect_success 'merge-msg -F' '

-       test_might_fail git config --unset-all merge.log &&
-       git config merge.summary yes &&
+       test_unconfig merge.log &&
+       test_config merge.summary yes &&

        git checkout master &&
        test_tick &&
        git fetch . left right &&
        git checkout master &&
        test_tick &&
        git fetch . left right &&


@@ -335,8 +330,8 @@ test_expect_success 'merge-msg -F' '
 '
 
 test_expect_success 'merge-msg -F in subdirectory' '
 '
 
 test_expect_success 'merge-msg -F in subdirectory' '

-       test_might_fail git config --unset-all merge.log &&
-       git config merge.summary yes &&
+       test_unconfig merge.log &&
+       test_config merge.summary yes &&

        git checkout master &&
        test_tick &&
        git fetch . left right &&
        git checkout master &&
        test_tick &&
        git fetch . left right &&


@@ -350,8 +345,8 @@ test_expect_success 'merge-msg -F in subdirectory' '
 '
 
 test_expect_success 'merge-msg with nothing to merge' '
 '
 
 test_expect_success 'merge-msg with nothing to merge' '

-       test_might_fail git config --unset-all merge.log &&
-       git config merge.summary yes &&
+       test_unconfig merge.log &&
+       test_config merge.summary yes &&

 
        >empty &&
 
 
        >empty &&
 


@@ -376,8 +371,8 @@ test_expect_success 'merge-msg tag' '
          Common #1
        EOF
 
          Common #1
        EOF
 

-       test_might_fail git config --unset-all merge.log &&
-       git config merge.summary yes &&
+       test_unconfig merge.log &&
+       test_config merge.summary yes &&

 
        git checkout master &&
        test_tick &&
 
        git checkout master &&
        test_tick &&


@@ -406,8 +401,8 @@ test_expect_success 'merge-msg two tags' '
          Common #1
        EOF
 
          Common #1
        EOF
 

-       test_might_fail git config --unset-all merge.log &&
-       git config merge.summary yes &&
+       test_unconfig merge.log &&
+       test_config merge.summary yes &&

 
        git checkout master &&
        test_tick &&
 
        git checkout master &&
        test_tick &&


@@ -436,8 +431,8 @@ test_expect_success 'merge-msg tag and branch' '
          Common #1
        EOF
 
          Common #1
        EOF
 

-       test_might_fail git config --unset-all merge.log &&
-       git config merge.summary yes &&
+       test_unconfig merge.log &&
+       test_config merge.summary yes &&

 
        git checkout master &&
        test_tick &&
 
        git checkout master &&
        test_tick &&


@@ -464,6 +459,8 @@ test_expect_success 'merge-msg lots of commits' '
                echo "  ..."
        } >expected &&
 
                echo "  ..."
        } >expected &&
 

+       test_config merge.summary yes &&
+

        git checkout master &&
        test_tick &&
        git fetch . long &&
        git checkout master &&
        test_tick &&
        git fetch . long &&