diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-05-11 11:38:36 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-05-11 11:38:36 -0700 |
| commit | c7fe5b61e15cc5195e33f7d5e5ec452e6966c1ad (patch) | |
| tree | bc8b989475dcb5abacff4135df4bc7aa8de43461 /t | |
| parent | Merge branch 'jn/maint-test-merge-verify-parents' (diff) | |
| parent | merge: make branch.<name>.mergeoptions correctly override merge.<option> (diff) | |
| download | tgif-c7fe5b61e15cc5195e33f7d5e5ec452e6966c1ad.tar.xz | |
Merge branch 'jc/maint-branch-mergeoptions'
* jc/maint-branch-mergeoptions:
merge: make branch.<name>.mergeoptions correctly override merge.<option>
Conflicts:
builtin/merge.c
Diffstat (limited to 't')
| -rwxr-xr-x | t/t7600-merge.sh | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/t/t7600-merge.sh b/t/t7600-merge.sh index b7cac228fd..a07caa8eae 100755 --- a/t/t7600-merge.sh +++ b/t/t7600-merge.sh @@ -323,6 +323,38 @@ test_expect_success 'merge c1 with c2 (no-commit in config)' ' test_debug 'git log --graph --decorate --oneline --all' +test_expect_success 'merge c1 with c2 (log in config)' ' + git config branch.master.mergeoptions "" && + git reset --hard c1 && + git merge --log c2 && + git show -s --pretty=tformat:%s%n%b >expect && + + git config branch.master.mergeoptions --log && + git reset --hard c1 && + git merge c2 && + git show -s --pretty=tformat:%s%n%b >actual && + + test_cmp expect actual +' + +test_expect_success 'merge c1 with c2 (log in config gets overridden)' ' + ( + git config --remove-section branch.master + git config --remove-section merge + ) + git reset --hard c1 && + git merge c2 && + git show -s --pretty=tformat:%s%n%b >expect && + + git config branch.master.mergeoptions "--no-log" && + git config merge.log true && + git reset --hard c1 && + git merge c2 && + git show -s --pretty=tformat:%s%n%b >actual && + + test_cmp expect actual +' + test_expect_success 'merge c1 with c2 (squash in config)' ' git reset --hard c1 && git config branch.master.mergeoptions "--squash" && |