[PATCH 2/2] t6200-fmt-merge-msg: Exercise '--log' to configure shortlog length
- From
Ramkumar Ramachandra <artagnon@gmail.com>
- Date
- Aug 27, 2010, 14:14 UTC
- Message-ID
- <1282918490-5190-3-git-send-email-artagnon@gmail.com>
- In-Reply-To
- <1282918490-5190-1-git-send-email-artagnon@gmail.com>
Add a test to exercise the '--log' command-line 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@gmail.com> --- t/t6200-fmt-merge-msg.sh | 56 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 56 insertions(+), 0 deletions(-)
diff --git a/t/t6200-fmt-merge-msg.sh b/t/t6200-fmt-merge-msg.sh index 750568e..b308c3b 100755 --- a/t/t6200-fmt-merge-msg.sh +++ b/t/t6200-fmt-merge-msg.sh @@ -184,6 +184,62 @@ test_expect_success 'configurable shortlog length: merge.log' ' test_cmp expected_b actual4 ' +test_expect_success 'configurable shortlog length: --log' ' + cat >expected1 <<-EOF && + Merge branch ${apos}left${apos} + + * left: (5 commits) + Left #5 + Left #4 + Left #3 + ... + EOF + + 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 --log=3 <.git/FETCH_HEAD >actual1 && + + cat >expected_b <<-EOF && + Merge branch ${apos}left${apos} + + * left: + Left #5 + Left #4 + Left #3 + Common #2 + Common #1 + EOF + + 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 --log <.git/FETCH_HEAD >actual2 && + + echo "Merge branch ${apos}left${apos}" >expected_c && + + 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 --no-log <.git/FETCH_HEAD >actual3 && + + test_cmp expected_a actual1 && + test_cmp expected_b actual2 && + test_cmp expected_c actual3 +' + test_expect_success 'fmt-merge-msg -m' ' echo "Sync with left" >expected && cat >expected.log <<-EOF &&
-- 1.7.2.2.409.gdbb11.dirty