summaryrefslogtreecommitdiff
path: root/t/t7600-merge.sh
diff options
context:
space:
mode:
authorJonathan Nieder <jrnieder@gmail.com>2011-05-06 16:59:47 -0500
committerJunio C Hamano <gitster@pobox.com>2011-05-06 16:03:37 -0700
commit8c5cea0095ee57c36fddfb9016810c230ce26557 (patch)
tree8d5ff7bf4b5f95f926d93a61be18fc0e29b62008 /t/t7600-merge.sh
parentf23e8decd544c8f81b40c98211f6cb028fa70cdc (diff)
downloadgit-8c5cea0095ee57c36fddfb9016810c230ce26557.tar.gz
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 <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t7600-merge.sh')
-rwxr-xr-xt/t7600-merge.sh16
1 files changed, 14 insertions, 2 deletions
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
'