Re: What's cooking in git.git (Jul 2013, #03; Tue, 9)
From: Junio C Hamano <hidden>
Date: 2016-06-15 22:58:14
Subsystem:
the rest · Maintainer:
Linus Torvalds
Possibly related (same subject, not in this thread)
- 2016-06-15 · Re: What's cooking in git.git (Jul 2013, #03; Tue, 9) · Ramkumar Ramachandra <hidden>
- 2016-06-15 · Re: What's cooking in git.git (Jul 2013, #03; Tue, 9) · Miklos Vajna <hidden>
- 2016-06-15 · Re: What's cooking in git.git (Jul 2013, #03; Tue, 9) · Junio C Hamano <hidden>
- 2016-06-15 · Re: What's cooking in git.git (Jul 2013, #03; Tue, 9) · Ramsay Jones <hidden>
- 2016-06-15 · Re: What's cooking in git.git (Jul 2013, #03; Tue, 9) · Ramsay Jones <hidden>
Miklos Vajna [off-list ref] writes:
quoted
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 <redacted> --- 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