Add a test to exercise the 'merge.log' configuration option of 'git
fmt-merge-msg'. It controls the number of shortlog entries to display
in merge commit messages.
Signed-off-by: Ramkumar Ramachandra <artagnon@xxxxxxxxx>
---
t/t6200-fmt-merge-msg.sh | 55 ++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 55 insertions(+), 0 deletions(-)
diff --git a/t/t6200-fmt-merge-msg.sh b/t/t6200-fmt-merge-msg.sh
index 71f6cad..750568e 100755
--- a/t/t6200-fmt-merge-msg.sh
+++ b/t/t6200-fmt-merge-msg.sh
@@ -129,6 +129,61 @@ test_expect_success '[merge] summary/log configuration' '
test_cmp expected actual2
'
+test_expect_success 'configurable shortlog length: merge.log' '
+ cat >expected_a <<-EOF &&
+ Merge branch ${apos}left${apos}
+
+ * left: (5 commits)
+ Left #5
+ Left #4
+ Left #3
+ ...
+ EOF
+
+ git config merge.log 3 &&
+ test_might_fail git config --unset-all merge.summary &&
+
+ git checkout master &&
+ test_tick &&
+ git fetch . left &&
+
+ git fmt-merge-msg <.git/FETCH_HEAD >actual1 &&
+
+ test_might_fail git config --unset-all merge.log &&
+ git config merge.summary 3 &&
+
+ git checkout master &&
+ test_tick &&
+ git fetch . left &&
+
+ git fmt-merge-msg <.git/FETCH_HEAD >actual2 &&
+
+ echo "Merge branch ${apos}left${apos}" >expected_b &&
+
+ git config merge.log 0 &&
+ test_might_fail git config --unset-all merge.summary &&
+
+ git checkout master &&
+ test_tick &&
+ git fetch . left &&
+
+ git fmt-merge-msg <.git/FETCH_HEAD >actual3 &&
+
+ test_might_fail git config --unset-all merge.log &&
+ test_might_fail git config --unset-all merge.summary &&
+
+ git checkout master &&
+ test_tick &&
+ git fetch . left &&
+
+ git fmt-merge-msg <.git/FETCH_HEAD >actual4 &&
+
+ test_cmp expected_a actual1 &&
+ test_cmp expected_a actual2 &&
+ test_cmp expected_b actual3 &&
+ test_cmp expected_b actual4
+'
+
test_expect_success 'fmt-merge-msg -m' '
echo "Sync with left" >expected &&
cat >expected.log <<-EOF &&
--
1.7.2.2.409.gdbb11.dirty
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html