mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jc/maint-branch-mergeoptions' into mg/merge-ff-config

Browse Source 
* jc/maint-branch-mergeoptions:
  merge: make branch.<name>.mergeoptions correctly override merge.<option>
This commit is contained in:
Junio C Hamano
2011-05-06 15:03:25 -07:00
parent ec014eac0e 0d8fc3efc6
commit 541d1fa85c
2 changed files with 59 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
t/t7600-merge.sh
View File

@ -324,6 +324,39 @@ 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)' '
test_when_finished "git config --remove-section branch.master" &&
test_when_finished "git config --remove-section merge" &&
test_might_fail git config --remove-section branch.master &&
test_might_fail 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" &&