From f23e8decd544c8f81b40c98211f6cb028fa70cdc Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Fri, 6 May 2011 12:27:05 -0700 Subject: merge: introduce merge.ff configuration variable This variable gives the default setting for --ff, --no-ff or --ff-only options of "git merge" command. Signed-off-by: Junio C Hamano --- t/t7600-merge.sh | 43 +++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 41 insertions(+), 2 deletions(-) (limited to 't') diff --git a/t/t7600-merge.sh b/t/t7600-merge.sh index 46b61ec3ed..83a3a42996 100755 --- a/t/t7600-merge.sh +++ b/t/t7600-merge.sh @@ -225,12 +225,28 @@ test_expect_success 'merge c1 with c2 and c3' ' test_debug 'git log --graph --decorate --oneline --all' -test_expect_success 'failing merges with --ff-only' ' +test_expect_success 'merges with --ff-only' ' git reset --hard c1 && test_tick && test_must_fail git merge --ff-only c2 && test_must_fail git merge --ff-only c3 && - test_must_fail git merge --ff-only c2 c3 + test_must_fail git merge --ff-only c2 c3 && + git reset --hard c0 && + git merge c3 && + verify_head $c3 +' + +test_expect_success 'merges with merge.ff=only' ' + git reset --hard c1 && + test_tick && + test_when_finished "git config --unset merge.ff" && + git config merge.ff only && + test_must_fail git merge c2 && + test_must_fail git merge c3 && + test_must_fail git merge c2 c3 && + git reset --hard c0 && + git merge c3 && + verify_head $c3 ' test_expect_success 'merge c0 with c1 (no-commit)' ' @@ -448,6 +464,29 @@ test_expect_success 'merge c0 with c1 (no-ff)' ' test_debug 'git log --graph --decorate --oneline --all' +test_expect_success 'merge c0 with c1 (merge.ff=false)' ' + git reset --hard c0 && + git config merge.ff false && + test_tick && + git merge c1 && + git config --remove-section merge && + verify_merge file result.1 && + verify_parents $c0 $c1 +' +test_debug 'git log --graph --decorate --oneline --all' + +test_expect_success 'combine branch.master.mergeoptions with merge.ff' ' + git reset --hard c0 && + git config branch.master.mergeoptions --ff + git config merge.ff false + test_tick && + git merge c1 && + git config --remove-section "branch.master" && + git config --remove-section "merge" && + verify_merge file result.1 && + verify_parents "$c0" +' + test_expect_success 'combining --squash and --no-ff is refused' ' test_must_fail git merge --squash --no-ff c1 && test_must_fail git merge --no-ff --squash c1 -- cgit v1.2.1 From 8c5cea0095ee57c36fddfb9016810c230ce26557 Mon Sep 17 00:00:00 2001 From: Jonathan Nieder Date: Fri, 6 May 2011 16:59:47 -0500 Subject: tests: check git does not barf on merge.ff values for future versions of git Maybe some day in the future we will want to support a syntax like [merge] ff = branch1 ff = branch2 ff = branch3 in addition to the currently permitted "true", "false", and "only" values. So make sure we continue to treat such configurations as though an unknown variable had been defined rather than erroring out, until it is time to implement such a thing, so configuration files using such a facility can be shared between present and future git. While at it, add a few missing && and start the "combining --squash and --no-ff" test with a known state so we can be sure it does not succeed or fail for the wrong reason. Signed-off-by: Jonathan Nieder Signed-off-by: Junio C Hamano --- t/t7600-merge.sh | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) (limited to 't') diff --git a/t/t7600-merge.sh b/t/t7600-merge.sh index 83a3a42996..8ddaa1d8ee 100755 --- a/t/t7600-merge.sh +++ b/t/t7600-merge.sh @@ -36,6 +36,7 @@ test_expect_success 'set up test data and helpers' ' printf "%s\n" "1 X" 2 3 4 5 6 7 8 9 >result.1 && printf "%s\n" "1 X" 2 3 4 "5 X" 6 7 8 9 >result.1-5 && printf "%s\n" "1 X" 2 3 4 "5 X" 6 7 8 "9 X" >result.1-5-9 && + >empty && create_merge_msgs() { echo "Merge commit '\''c2'\''" >msg.1-5 && @@ -477,8 +478,8 @@ test_debug 'git log --graph --decorate --oneline --all' test_expect_success 'combine branch.master.mergeoptions with merge.ff' ' git reset --hard c0 && - git config branch.master.mergeoptions --ff - git config merge.ff false + git config branch.master.mergeoptions --ff && + git config merge.ff false && test_tick && git merge c1 && git config --remove-section "branch.master" && @@ -487,7 +488,18 @@ test_expect_success 'combine branch.master.mergeoptions with merge.ff' ' verify_parents "$c0" ' +test_expect_success 'tolerate unknown values for merge.ff' ' + git reset --hard c0 && + git config merge.ff something-new && + test_tick && + git merge c1 2>message && + git config --remove-section "merge" && + verify_head "$c1" && + test_cmp empty message +' + test_expect_success 'combining --squash and --no-ff is refused' ' + git reset --hard c0 && test_must_fail git merge --squash --no-ff c1 && test_must_fail git merge --no-ff --squash c1 ' -- cgit v1.2.1