diff options
| author | SZEDER Gábor <szeder@ira.uka.de> | 2008-04-06 03:23:46 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-04-12 19:28:18 -0700 |
| commit | efb779f8873e5aa36be29a4e551186c62c1b580c (patch) | |
| tree | fee6f6a34142af04294bbb2ce13822bf4ccb1c13 /t/t7600-merge.sh | |
| parent | 6cd9cfefc505ed5ab5ff435ff9ef338ac8721225 (diff) | |
| download | git-efb779f8873e5aa36be29a4e551186c62c1b580c.tar.gz | |
merge, pull: add '--(no-)log' command line option
These are the command line option equivalents of the 'merge.log' config
variable.
The patch also updates documentation and bash completion accordingly, and
adds a test.
Signed-off-by: SZEDER Gábor <szeder@ira.uka.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t7600-merge.sh')
| -rwxr-xr-x | t/t7600-merge.sh | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/t/t7600-merge.sh b/t/t7600-merge.sh index dd3eb97363..d21cd290d3 100755 --- a/t/t7600-merge.sh +++ b/t/t7600-merge.sh @@ -104,7 +104,11 @@ create_merge_msgs() { git log --no-merges ^HEAD c2 >>squash.1-5 && echo "Squashed commit of the following:" >squash.1-5-9 && echo >>squash.1-5-9 && - git log --no-merges ^HEAD c2 c3 >>squash.1-5-9 + git log --no-merges ^HEAD c2 c3 >>squash.1-5-9 && + echo > msg.nolog && + echo "* commit 'c3':" >msg.log && + echo " commit 3" >>msg.log && + echo >>msg.log } verify_diff() { @@ -456,6 +460,16 @@ test_expect_success 'merge c0 with c1 (ff overrides no-ff)' ' verify_head $c1 ' +test_expect_success 'merge log message' ' + git reset --hard c0 && + git merge --no-log c2 && + git show -s --pretty=format:%b HEAD >msg.act && + verify_diff msg.nolog msg.act "[OOPS] bad merge log message" && + git merge --log c3 && + git show -s --pretty=format:%b HEAD >msg.act && + verify_diff msg.log msg.act "[OOPS] bad merge log message" +' + test_debug 'gitk --all' test_done |