From: Jeff King <peff@peff.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: Johannes Sixt <j6t@kdbg.org>, Klaus Ethgen <Klaus@Ethgen.ch>,
git@vger.kernel.org
Subject: [PATCH 0/2] handling alternates paths with colons
Date: Mon, 12 Dec 2016 14:49:29 -0500 [thread overview]
Message-ID: <20161212194929.bdcihf7orjabzb2h@sigill.intra.peff.net> (raw)
In-Reply-To: <20161210085133.2pnkz6eqlxoxdckg@sigill.intra.peff.net>
On Sat, Dec 10, 2016 at 03:51:33AM -0500, Jeff King wrote:
> So here's the array of options, as I see it:
>
> 1. Disable quarantine by default; only turn it on if you don't have
> any of the funny corner cases.
>
> 2. Introduce an extra single-item environment variable that gets
> appended to the list of alternates, and side-steps quoting issues.
>
> 3. Introduce a new variable that can hold an alternate list, and
> either teach it reasonable quoting semantics, or give it a
> less-common separator.
>
> 4. Introduce quoting to the existing variable, but make the quoting
> character sufficiently obscure that nobody cares about the lack of
> backwards compatibility.
So I started on (4), but writing the user-facing documentation made me
throw up in my mouth a little. Fortunately that inspired me to come up
with a fifth option: introduce a quoting mechanism that needs a more
obscure signature to kick in, but once kicked-in, uses a less obscure
syntax.
So here are patches that do that. It kicks in only when the first
character of a path is a double-quote, and then expects the usual
C-style quoting. My reasoning is that we wouldn't want to sacrifice
'"' for ':', but it's probably OK if we only care about '"' at the very
beginning of a path. And it's consistent with many other parts of git
which allow optional quoting.
Thoughts?
[1/2]: alternates: accept double-quoted paths
[2/2]: tmp-objdir: quote paths we add to alternates
Documentation/git.txt | 6 ++++++
sha1_file.c | 47 +++++++++++++++++++++++++++++++++++-----------
t/t5547-push-quarantine.sh | 19 +++++++++++++++++++
t/t5615-alternate-env.sh | 18 ++++++++++++++++++
tmp-objdir.c | 18 +++++++++++++++++-
5 files changed, 96 insertions(+), 12 deletions(-)
-Peff
next prev parent reply other threads:[~2016-12-12 19:49 UTC|newest]
Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-12-09 14:02 [BUG] Colon in remote urls Klaus Ethgen
2016-12-09 15:22 ` Jeff King
2016-12-09 19:07 ` Junio C Hamano
2016-12-10 8:51 ` Jeff King
2016-12-12 19:49 ` Jeff King [this message]
2016-12-12 19:52 ` [PATCH 1/2] alternates: accept double-quoted paths Jeff King
2016-12-13 11:30 ` Duy Nguyen
2016-12-13 11:52 ` Jeff King
2016-12-13 18:08 ` Junio C Hamano
2016-12-17 7:56 ` Duy Nguyen
2016-12-12 19:53 ` [PATCH 2/2] tmp-objdir: quote paths we add to alternates Jeff King
2016-12-12 20:53 ` Johannes Sixt
2016-12-13 11:44 ` Jeff King
2016-12-13 18:10 ` Junio C Hamano
2016-12-13 18:15 ` Jeff King
2016-12-13 20:10 ` Junio C Hamano
2016-12-13 19:09 ` [PATCH 3/2] t5547-push-quarantine: run the path separator test on Windows, too Johannes Sixt
2016-12-13 19:12 ` Jeff King
2016-12-13 19:23 ` Junio C Hamano
2016-12-21 21:33 ` [PATCH 4/2] t5615-alternate-env: double-quotes in file names do not work on Windows Johannes Sixt
2016-12-21 22:42 ` Jeff King
2016-12-22 6:13 ` Johannes Sixt
2016-12-22 19:06 ` Johannes Sixt
2016-12-22 21:38 ` Johannes Schindelin
2016-12-22 22:19 ` Jeff King
2016-12-12 22:37 ` [PATCH 0/2] handling alternates paths with colons Junio C Hamano
2016-12-13 11:50 ` Jeff King
2016-12-13 18:10 ` Junio C Hamano
2016-12-13 18:17 ` Jeff King
2016-12-13 18:42 ` Junio C Hamano
2016-12-13 18:47 ` Jeff King
2016-12-10 9:29 ` [BUG] Colon in remote urls Klaus Ethgen
2016-12-10 10:24 ` Jeff King
2016-12-10 10:46 ` Klaus Ethgen
2016-12-09 21:32 ` Johannes Sixt
2016-12-10 8:26 ` Jeff King
2016-12-10 9:41 ` Klaus Ethgen
2016-12-10 10:26 ` Jeff King
2016-12-10 10:51 ` Klaus Ethgen
2016-12-10 9:32 ` Klaus Ethgen
2016-12-10 18:18 ` Johannes Schindelin
2016-12-11 11:02 ` Klaus Ethgen
2016-12-11 14:51 ` Philip Oakley
2016-12-12 11:03 ` Johannes Schindelin
2016-12-12 11:50 ` Klaus Ethgen
2016-12-12 14:05 ` Johannes Schindelin
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=20161212194929.bdcihf7orjabzb2h@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=Klaus@Ethgen.ch \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=j6t@kdbg.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).