From: Ramkumar Ramachandra Date: Tue, 23 Jul 2013 07:23:25 GMT Subject: Re: What's cooking in git.git (Jul 2013, #03; Tue, 9) Message-ID: In-Reply-To: <7vr4f7tjo0.fsf@alter.siamese.dyndns.org> Junio C Hamano wrote: > * mv/merge-ff-tristate (2013-07-02) 1 commit > (merged to 'next' on 2013-07-09 at c32b95d) > + merge: handle --ff/--no-ff/--ff-only as a tri-state option Sorry I didn't notice sooner, but I was confused by the second test title this added: test_expect_success 'option --ff-only overwrites merge.ff=only config' ' git reset --hard c0 && test_config merge.ff only && git merge --no-ff c1 ' How is --ff-only overwriting merge.ff=only here? Was it a typo? -- 8< -- diff --git a/t/t7600-merge.sh b/t/t7600-merge.sh index 3ff5fb8..aea8137 100755 --- a/t/t7600-merge.sh +++ b/t/t7600-merge.sh @@ -502,7 +502,7 @@ test_expect_success 'option --ff-only overwrites --no-ff' ' test_must_fail git merge --no-ff --ff-only c2 ' -test_expect_success 'option --ff-only overwrites merge.ff=only config' ' +test_expect_success 'option --no-ff overwrites merge.ff=only config' ' git reset --hard c0 && test_config merge.ff only && git merge --no-ff c1