Re: [PATCH v7 0/3] Conditional config include
From: Junio C Hamano <hidden>
Date: 2017-03-03 21:13:56
Duy Nguyen [off-list ref] writes:
quoted hunk
On Fri, Mar 03, 2017 at 01:33:29AM -0500, Jeff King wrote:quoted
For those following on the mailing list, there is some discussion at: https://github.com/git/git/commit/484f78e46d00c6d35f20058671a8c76bb924fb33 I think that is mostly focused around another failing in the error-handling of the config code, and that does not need to be addressed by this series (though of course I'd welcome any fixes). But there's a test failure that probably does need to be dealt with before this graduates to 'next'.The patch to fix it is thisdiff --git a/t/t1305-config-include.sh b/t/t1305-config-include.sh index f0cd2056ba..e833939320 100755 --- a/t/t1305-config-include.sh +++ b/t/t1305-config-include.sh@@ -102,7 +102,7 @@ test_expect_success 'config modification does not affect includes' ' test_expect_success 'missing include files are ignored' ' cat >.gitconfig <<-\EOF && - [include]path = foo + [include]path = non-existent [test]value = yes EOF echo yes >expect &&Junio could you squash this in?
I said yes, but I won't, as the series already has SQUASH??? for other things, so I'll just queue this at the tip. I _might_ get inclined to do the squashing and cleaning up myself later, but please don't hold your breath.