From: Duy Nguyen <pclouds@gmail.com>
To: Jeff King <peff@peff.net>, Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, sschuberth@gmail.com,
Matthieu Moy <Matthieu.Moy@grenoble-inp.fr>,
Philip Oakley <philipoakley@iee.org>,
Ramsay Jones <ramsay@ramsayjones.plus.com>
Subject: Re: [PATCH v7 0/3] Conditional config include
Date: Fri, 3 Mar 2017 16:52:52 +0700 [thread overview]
Message-ID: <20170303095252.GA12072@ash> (raw)
In-Reply-To: <20170303063329.ji6do6eqjbpuwmxz@sigill.intra.peff.net>
On Fri, Mar 03, 2017 at 01:33:29AM -0500, Jeff King wrote:
> 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 this
diff --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?
A lot more explanation is in another series [1] I just sent. Not sure
if we want to repeat the same in this commit's message.
And this series without that squash, when combined with [1], will fail
this test even on Linux. Good thing imo.
[1] http://public-inbox.org/git/20170303094252.11706-1-pclouds@gmail.com/
--
Duy
next prev parent reply other threads:[~2017-03-03 9:53 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-23 12:23 [PATCH v5 0/1] Conditional config include Nguyễn Thái Ngọc Duy
2017-02-23 12:23 ` [PATCH v5 1/1] config: add conditional include Nguyễn Thái Ngọc Duy
2017-02-23 19:59 ` Junio C Hamano
2017-02-24 9:37 ` Duy Nguyen
2017-02-24 17:46 ` Junio C Hamano
2017-02-26 6:07 ` Jeff King
2017-02-27 18:42 ` Junio C Hamano
2017-03-06 22:44 ` Stefan Beller
2017-03-07 8:47 ` Jeff King
2017-03-07 18:39 ` Stefan Beller
2017-02-24 13:14 ` [PATCH v6 0/1] Conditional config include Nguyễn Thái Ngọc Duy
2017-02-24 13:14 ` [PATCH v6 1/1] config: add conditional include Nguyễn Thái Ngọc Duy
2017-02-24 18:35 ` Junio C Hamano
2017-02-24 19:48 ` Ramsay Jones
2017-02-24 22:08 ` Philip Oakley
2017-02-26 3:02 ` Duy Nguyen
2017-02-26 12:27 ` Philip Oakley
2017-02-24 13:14 ` [PATCH v6 0/1] Conditional config include Nguyễn Thái Ngọc Duy
2017-02-24 13:18 ` Duy Nguyen
2017-02-24 13:14 ` [PATCH v6 1/1] config: add conditional include Nguyễn Thái Ngọc Duy
2017-02-26 6:12 ` Jeff King
2017-03-01 11:26 ` [PATCH v7 0/3] Conditional config include Nguyễn Thái Ngọc Duy
2017-03-01 11:26 ` [PATCH v7 1/3] config.txt: clarify multiple key values in include.path Nguyễn Thái Ngọc Duy
2017-03-01 17:40 ` Junio C Hamano
2017-03-01 11:26 ` [PATCH v7 2/3] config.txt: reflow the second include.path paragraph Nguyễn Thái Ngọc Duy
2017-03-01 11:26 ` [PATCH v7 3/3] config: add conditional include Nguyễn Thái Ngọc Duy
2017-03-01 17:16 ` Ramsay Jones
2017-03-01 17:47 ` Junio C Hamano
2017-03-03 6:30 ` Jeff King
2017-03-03 19:05 ` Junio C Hamano
2017-03-03 22:24 ` Jeff King
2017-03-01 17:52 ` [PATCH v7 0/3] Conditional config include Junio C Hamano
2017-03-03 6:33 ` Jeff King
2017-03-03 9:52 ` Duy Nguyen [this message]
2017-03-03 19:13 ` Junio C Hamano
2017-03-03 21:08 ` Junio C Hamano
2017-03-03 18:24 ` Junio C Hamano
2017-03-03 22:22 ` Jeff King
2017-03-03 23:22 ` 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=20170303095252.GA12072@ash \
--to=pclouds@gmail.com \
--cc=Matthieu.Moy@grenoble-inp.fr \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
--cc=philipoakley@iee.org \
--cc=ramsay@ramsayjones.plus.com \
--cc=sschuberth@gmail.com \
/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).