From: Junio C Hamano <gitster@pobox.com>
To: Miklos Vajna <vmiklos@suse.cz>
Cc: Ramkumar Ramachandra <artagnon@gmail.com>, git@vger.kernel.org
Subject: Re: What's cooking in git.git (Jul 2013, #03; Tue, 9)
Date: Tue, 23 Jul 2013 10:09:30 -0700 [thread overview]
Message-ID: <7vppu98aph.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <20130723090659.GB9639@suse.cz> (Miklos Vajna's message of "Tue, 23 Jul 2013 11:07:00 +0200")
Miklos Vajna <vmiklos@suse.cz> writes:
>> How is --ff-only overwriting merge.ff=only here? Was it a typo?
>
> Yes, it's a typo in the test name. Thanks for spotting that!
Thanks, will do this:
Subject: [PATCH] t7600: fix typo in test title
Spotted by Ram, confirmed by Miklos.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
t/t7600-merge.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/t/t7600-merge.sh b/t/t7600-merge.sh
index 3ff5fb8..10aa028 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 overrides merge.ff=only config' '
git reset --hard c0 &&
test_config merge.ff only &&
git merge --no-ff c1
--
1.8.3.4-985-g5661af8
prev parent reply other threads:[~2013-07-23 17:09 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
2013-07-23 9:07 ` Miklos Vajna
2013-07-23 17:09 ` Junio C Hamano [this message]
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=7vppu98aph.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=artagnon@gmail.com \
--cc=git@vger.kernel.org \
--cc=vmiklos@suse.cz \
/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).