Merge branch 'maint'

diff --git a/t/t6200-fmt-merge-msg.sh b/t/t6200-fmt-merge-msg.sh
index 42f8ece0978f38e10200a52ce8cf1952cf13ecbd..9a168069217ef8d82173e563a04eaefe58d99f2a 100755 (executable)
--- a/t/t6200-fmt-merge-msg.sh
+++ b/t/t6200-fmt-merge-msg.sh
@@ -70,14 +70,13 @@ test_expect_success setup '
                i=$(($i+1))
        done &&
 
-       git show-branch
-'
+       git show-branch &&
 
-cat >expected <<\EOF
-Merge branch 'left'
-EOF
+       apos="'\''"
+'
 
-test_expect_success 'merge-msg test #1' '
+test_expect_success 'message for merging local branch' '
+       echo "Merge branch ${apos}left${apos}" >expected &&
 
        git checkout master &&
        git fetch . left &&
@@ -86,11 +85,8 @@ test_expect_success 'merge-msg test #1' '
        test_cmp expected actual
 '
 
-cat >expected <<EOF
-Merge branch 'left' of $(pwd)
-EOF
-
-test_expect_success 'merge-msg test #2' '
+test_expect_success 'message for merging external branch' '
+       echo "Merge branch ${apos}left${apos} of $(pwd)" >expected &&
 
        git checkout master &&
        git fetch "$(pwd)" left &&
@@ -99,139 +95,231 @@ test_expect_success 'merge-msg test #2' '
        test_cmp expected actual
 '
 
-cat >expected <<\EOF
-Merge branch 'left'
+test_expect_success '[merge] summary/log configuration' '
+       cat >expected <<-EOF &&
+       Merge branch ${apos}left${apos}
 
-* left:
-  Left #5
-  Left #4
-  Left #3
-  Common #2
-  Common #1
-EOF
+       * left:
+         Left #5
+         Left #4
+         Left #3
+         Common #2
+         Common #1
+       EOF
 
-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 &&
+       test_might_fail git config --unset-all merge.summary &&
 
        git checkout master &&
        test_tick &&
        git fetch . left &&
 
-       git fmt-merge-msg <.git/FETCH_HEAD >actual &&
-       test_cmp expected actual
-'
-
-test_expect_success 'merge-msg test #3-2' '
+       git fmt-merge-msg <.git/FETCH_HEAD >actual1 &&
 
-       git config --unset-all merge.log
-       git config --unset-all merge.summary
+       test_might_fail git config --unset-all merge.log &&
        git config merge.summary true &&
 
        git checkout master &&
        test_tick &&
        git fetch . left &&
 
-       git fmt-merge-msg <.git/FETCH_HEAD >actual &&
+       git fmt-merge-msg <.git/FETCH_HEAD >actual2 &&
+
+       test_cmp expected actual1 &&
+       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 &&
+       git fetch . left
+'
+
+test_expect_success 'merge.log=3 limits shortlog length' '
+       cat >expected <<-EOF &&
+       Merge branch ${apos}left${apos}
+
+       * left: (5 commits)
+         Left #5
+         Left #4
+         Left #3
+         ...
+       EOF
+
+       git -c merge.log=3 fmt-merge-msg <.git/FETCH_HEAD >actual &&
        test_cmp expected actual
 '
 
-cat >expected <<\EOF
-Merge branches 'left' and 'right'
+test_expect_success 'merge.log=5 shows all 5 commits' '
+       cat >expected <<-EOF &&
+       Merge branch ${apos}left${apos}
 
-* left:
-  Left #5
-  Left #4
-  Left #3
-  Common #2
-  Common #1
+       * left:
+         Left #5
+         Left #4
+         Left #3
+         Common #2
+         Common #1
+       EOF
 
-* right:
-  Right #5
-  Right #4
-  Right #3
-  Common #2
-  Common #1
-EOF
+       git -c merge.log=5 fmt-merge-msg <.git/FETCH_HEAD >actual &&
+       test_cmp expected actual
+'
 
-test_expect_success 'merge-msg test #4-1' '
+test_expect_success 'merge.log=0 disables shortlog' '
+       echo "Merge branch ${apos}left${apos}" >expected
+       git -c merge.log=0 fmt-merge-msg <.git/FETCH_HEAD >actual &&
+       test_cmp expected actual
+'
 
-       git config --unset-all merge.log
-       git config --unset-all merge.summary
-       git config merge.log true &&
+test_expect_success '--log=3 limits shortlog length' '
+       cat >expected <<-EOF &&
+       Merge branch ${apos}left${apos}
 
-       git checkout master &&
-       test_tick &&
-       git fetch . left right &&
+       * left: (5 commits)
+         Left #5
+         Left #4
+         Left #3
+         ...
+       EOF
 
-       git fmt-merge-msg <.git/FETCH_HEAD >actual &&
+       git fmt-merge-msg --log=3 <.git/FETCH_HEAD >actual &&
        test_cmp expected actual
 '
 
-test_expect_success 'merge-msg test #4-2' '
+test_expect_success '--log=5 shows all 5 commits' '
+       cat >expected <<-EOF &&
+       Merge branch ${apos}left${apos}
 
-       git config --unset-all merge.log
-       git config --unset-all merge.summary
-       git config merge.summary true &&
+       * left:
+         Left #5
+         Left #4
+         Left #3
+         Common #2
+         Common #1
+       EOF
 
-       git checkout master &&
-       test_tick &&
-       git fetch . left right &&
+       git fmt-merge-msg --log=5 <.git/FETCH_HEAD >actual &&
+       test_cmp expected actual
+'
 
-       git fmt-merge-msg <.git/FETCH_HEAD >actual &&
+test_expect_success '--no-log disables shortlog' '
+       echo "Merge branch ${apos}left${apos}" >expected &&
+       git fmt-merge-msg --no-log <.git/FETCH_HEAD >actual &&
        test_cmp expected actual
 '
 
-test_expect_success 'merge-msg test #5-1' '
+test_expect_success '--log=0 disables shortlog' '
+       echo "Merge branch ${apos}left${apos}" >expected &&
+       git fmt-merge-msg --no-log <.git/FETCH_HEAD >actual &&
+       test_cmp expected actual
+'
 
-       git config --unset-all merge.log
-       git config --unset-all merge.summary
-       git config merge.log yes &&
+test_expect_success 'fmt-merge-msg -m' '
+       echo "Sync with left" >expected &&
+       cat >expected.log <<-EOF &&
+       Sync with left
+
+       * ${apos}left${apos} of $(pwd):
+         Left #5
+         Left #4
+         Left #3
+         Common #2
+         Common #1
+       EOF
+
+       test_might_fail git config --unset merge.log &&
+       test_might_fail git config --unset 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 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/FETCH_HEAD >actual.nolog &&
+
+       test_cmp expected actual &&
+       test_cmp expected.log actual.log &&
+       test_cmp expected.log actual.log-config &&
+       test_cmp expected actual.nolog
+'
+
+test_expect_success 'setup: expected shortlog for two branches' '
+       cat >expected <<-EOF
+       Merge branches ${apos}left${apos} and ${apos}right${apos}
+
+       * left:
+         Left #5
+         Left #4
+         Left #3
+         Common #2
+         Common #1
+
+       * right:
+         Right #5
+         Right #4
+         Right #3
+         Common #2
+         Common #1
+       EOF
+'
 
+test_expect_success 'shortlog for two branches' '
+       git config merge.log true &&
+       test_might_fail git config --unset-all merge.summary &&
        git checkout master &&
        test_tick &&
        git fetch . left right &&
+       git fmt-merge-msg <.git/FETCH_HEAD >actual1 &&
 
-       git fmt-merge-msg <.git/FETCH_HEAD >actual &&
-       test_cmp expected actual
-'
+       test_might_fail git config --unset-all merge.log &&
+       git config merge.summary true &&
+       git checkout master &&
+       test_tick &&
+       git fetch . left right &&
+       git fmt-merge-msg <.git/FETCH_HEAD >actual2 &&
 
-test_expect_success 'merge-msg test #5-2' '
+       git config merge.log yes &&
+       test_might_fail git config --unset-all merge.summary &&
+       git checkout master &&
+       test_tick &&
+       git fetch . left right &&
+       git fmt-merge-msg <.git/FETCH_HEAD >actual3 &&
 
-       git config --unset-all merge.log
-       git config --unset-all merge.summary
+       test_might_fail git config --unset-all merge.log &&
        git config merge.summary yes &&
-
        git checkout master &&
        test_tick &&
        git fetch . left right &&
+       git fmt-merge-msg <.git/FETCH_HEAD >actual4 &&
 
-       git fmt-merge-msg <.git/FETCH_HEAD >actual &&
-       test_cmp expected actual
+       test_cmp expected actual1 &&
+       test_cmp expected actual2 &&
+       test_cmp expected actual3 &&
+       test_cmp expected actual4
 '
 
 test_expect_success 'merge-msg -F' '
-
-       git config --unset-all merge.log
-       git config --unset-all merge.summary
+       test_might_fail git config --unset-all merge.log &&
        git config merge.summary yes &&
-
        git checkout master &&
        test_tick &&
        git fetch . left right &&
-
        git fmt-merge-msg -F .git/FETCH_HEAD >actual &&
        test_cmp expected actual
 '
 
 test_expect_success 'merge-msg -F in subdirectory' '
-
-       git config --unset-all merge.log
-       git config --unset-all merge.summary
+       test_might_fail git config --unset-all merge.log &&
        git config merge.summary yes &&
-
        git checkout master &&
        test_tick &&
        git fetch . left right &&
@@ -245,11 +333,11 @@ test_expect_success 'merge-msg -F in subdirectory' '
 '
 
 test_expect_success 'merge-msg with nothing to merge' '
-
-       git config --unset-all merge.log
-       git config --unset-all merge.summary
+       test_might_fail git config --unset-all merge.log &&
        git config merge.summary yes &&
 
+       >empty &&
+
        (
                cd remote &&
                git checkout -b unrelated &&
@@ -258,22 +346,20 @@ test_expect_success 'merge-msg with nothing to merge' '
                git fmt-merge-msg <.git/FETCH_HEAD >../actual
        ) &&
 
-       test_cmp /dev/null actual
+       test_cmp empty actual
 '
 
-cat >expected <<\EOF
-Merge tag 'tag-r3'
-
-* tag 'tag-r3':
-  Right #3
-  Common #2
-  Common #1
-EOF
-
 test_expect_success 'merge-msg tag' '
+       cat >expected <<-EOF &&
+       Merge tag ${apos}tag-r3${apos}
+
+       * tag ${apos}tag-r3${apos}:
+         Right #3
+         Common #2
+         Common #1
+       EOF
 
-       git config --unset-all merge.log
-       git config --unset-all merge.summary
+       test_might_fail git config --unset-all merge.log &&
        git config merge.summary yes &&
 
        git checkout master &&
@@ -284,26 +370,24 @@ test_expect_success 'merge-msg tag' '
        test_cmp expected actual
 '
 
-cat >expected <<\EOF
-Merge tags 'tag-r3' and 'tag-l5'
-
-* tag 'tag-r3':
-  Right #3
-  Common #2
-  Common #1
-
-* tag 'tag-l5':
-  Left #5
-  Left #4
-  Left #3
-  Common #2
-  Common #1
-EOF
-
 test_expect_success 'merge-msg two tags' '
-
-       git config --unset-all merge.log
-       git config --unset-all merge.summary
+       cat >expected <<-EOF &&
+       Merge tags ${apos}tag-r3${apos} and ${apos}tag-l5${apos}
+
+       * tag ${apos}tag-r3${apos}:
+         Right #3
+         Common #2
+         Common #1
+
+       * tag ${apos}tag-l5${apos}:
+         Left #5
+         Left #4
+         Left #3
+         Common #2
+         Common #1
+       EOF
+
+       test_might_fail git config --unset-all merge.log &&
        git config merge.summary yes &&
 
        git checkout master &&
@@ -314,26 +398,24 @@ test_expect_success 'merge-msg two tags' '
        test_cmp expected actual
 '
 
-cat >expected <<\EOF
-Merge branch 'left', tag 'tag-r3'
-
-* tag 'tag-r3':
-  Right #3
-  Common #2
-  Common #1
-
-* left:
-  Left #5
-  Left #4
-  Left #3
-  Common #2
-  Common #1
-EOF
-
 test_expect_success 'merge-msg tag and branch' '
-
-       git config --unset-all merge.log
-       git config --unset-all merge.summary
+       cat >expected <<-EOF &&
+       Merge branch ${apos}left${apos}, tag ${apos}tag-r3${apos}
+
+       * tag ${apos}tag-r3${apos}:
+         Right #3
+         Common #2
+         Common #1
+
+       * left:
+         Left #5
+         Left #4
+         Left #3
+         Common #2
+         Common #1
+       EOF
+
+       test_might_fail git config --unset-all merge.log &&
        git config merge.summary yes &&
 
        git checkout master &&
@@ -344,26 +426,27 @@ test_expect_success 'merge-msg tag and branch' '
        test_cmp expected actual
 '
 
-cat >expected <<\EOF
-Merge branch 'long'
-
-* long: (35 commits)
-EOF
-
 test_expect_success 'merge-msg lots of commits' '
+       {
+               cat <<-EOF &&
+               Merge branch ${apos}long${apos}
+
+               * long: (35 commits)
+               EOF
+
+               i=29 &&
+               while test $i -gt 9
+               do
+                       echo "  $i" &&
+                       i=$(($i-1))
+               done &&
+               echo "  ..."
+       } >expected &&
 
        git checkout master &&
        test_tick &&
        git fetch . long &&
 
-       i=29 &&
-       while test $i -gt 9
-       do
-               echo "  $i" &&
-               i=$(($i-1))
-       done >>expected &&
-       echo "  ..." >>expected
-
        git fmt-merge-msg <.git/FETCH_HEAD >actual &&
        test_cmp expected actual
 '