git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Ramkumar Ramachandra <artagnon@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, Miklos V <vmiklos@frugalware.org>
Subject: Re: What's cooking in git.git (Jul 2013, #03; Tue, 9)
Date: Tue, 23 Jul 2013 12:53:25 +0530	[thread overview]
Message-ID: <CALkWK0kmcQ1ws143H7O6q9kRmdBxMDVYBWVBKp+0Hy0acpn7VA@mail.gmail.com> (raw)
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

  parent reply	other threads:[~2013-07-23  7:24 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-07-09 23:09 What's cooking in git.git (Jul 2013, #03; Tue, 9) Junio C Hamano
2013-07-10  0:26 ` Jeff King
2013-07-10  7:00 ` Kyle McKay
2013-07-11 16:45   ` Junio C Hamano
2013-07-10  8:10 ` Matthieu Moy
2013-07-11 16:45   ` Junio C Hamano
2013-07-15 17:51 ` Ramsay Jones
2013-07-15 19:33   ` Junio C Hamano
2013-07-19 16:15   ` Junio C Hamano
2013-07-20 20:01     ` Ramsay Jones
2013-07-23  7:23 ` Ramkumar Ramachandra [this message]
2013-07-23  9:07   ` Miklos Vajna
2013-07-23 17:09     ` Junio C Hamano

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=CALkWK0kmcQ1ws143H7O6q9kRmdBxMDVYBWVBKp+0Hy0acpn7VA@mail.gmail.com \
    --to=artagnon@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=vmiklos@frugalware.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).