From: Junio C Hamano <gitster@pobox•com>
To: Johannes Schindelin <Johannes.Schindelin@gmx•de>
Cc: git@vger•kernel.org, Jacob Keller <jacob.keller@gmail•com>
Subject: Re: [PATCH] squash! diff: add --diff-line-prefix option for passing in a prefix
Date: Mon, 15 Aug 2016 09:20:08 -0700 [thread overview]
Message-ID: <xmqqfuq6humf.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <alpine.DEB.2.20.1608151519480.4924@virtualbox> (Johannes Schindelin's message of "Mon, 15 Aug 2016 16:07:21 +0200 (CEST)")
Johannes Schindelin <Johannes.Schindelin@gmx•de> writes:
> On Sun, 14 Aug 2016, Junio C Hamano wrote:
>
>> Johannes Schindelin <johannes.schindelin@gmx•de> writes:
>>
>> > - test=$(echo "$cmd" | sed -e 's|[/ ][/ ]*|_|g')
>> > + test=$(echo "$cmd" | sed -e 's|[/ ][/ ]*|_|g' -e 'y/>/_/')
>> ...
> I know that this is so because my first iteration of the patch did exactly
> what you suggested.
You probably should have stepped back and taken a deep breath before
writing the second round. Doing so after writing it before sending
would also have been OK.
Among three characters that are special cased here, the problem "if
we squish a run of problematic characters into one underscore, we
risk making the result ambiguous" is NOT limited to '>'; it is not a
new problem with '>', either. I can think of two other possible
solutions offhand:
(1) drop "squishing a run", i.e. [/ ]*, from the regexp, and rename
existing test vectors that would be affected;
(2) change the string used in the offending test so that squishing
will not make the result ambiguous.
before special casing "y/>/_/"; as there is nothing in ">" that
inherently causes the ambiguity that won't be caused by "/" or " ",
adding second clause to the sed expression that does things
differently only for ">" is simply wrong. After all, you only
wanted to affect the "prefix=-->" test and not the whole set of the
tests in the script.
Obviously (1) is a lot of impact with little gain, and as Jacob
already offered to do, I think (2) is a lot more sensible solution
and it also is more in line with your "If it isn't broken, do not
fix it", I would say.
next prev parent reply other threads:[~2016-08-15 16:21 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-08-14 8:56 [PATCH] squash! diff: add --diff-line-prefix option for passing in a prefix Johannes Schindelin
2016-08-14 20:42 ` Junio C Hamano
2016-08-15 14:07 ` Johannes Schindelin
2016-08-15 16:20 ` Junio C Hamano [this message]
2016-08-16 15:39 ` 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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqfuq6humf.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox$(echo .)com \
--cc=Johannes.Schindelin@gmx$(echo .)de \
--cc=git@vger$(echo .)kernel.org \
--cc=jacob.keller@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox