From: Junio C Hamano <gitster@pobox.com>
To: "brian m. carlson" <sandals@crustytoothpaste.net>
Cc: Mike Rappazzo <rappazzo@gmail.com>,
Michael Rappazzo via GitGitGadget <gitgitgadget@gmail.com>,
Git List <git@vger.kernel.org>
Subject: Re: [PATCH 0/1] sequencer: comment out the 'squash!' line
Date: Wed, 08 Jan 2020 08:53:06 -0800 [thread overview]
Message-ID: <xmqqv9pl3n65.fsf@gitster-ct.c.googlers.com> (raw)
In-Reply-To: <20200108025509.GM6570@camp.crustytoothpaste.net> (brian m. carlson's message of "Wed, 8 Jan 2020 02:55:09 +0000")
"brian m. carlson" <sandals@crustytoothpaste.net> writes:
> On 2020-01-07 at 16:15:16, Junio C Hamano wrote:
>> "brian m. carlson" <sandals@crustytoothpaste.net> writes:
>>
>> > I can see the argument that this makes it a little harder for mechanical
>> > processing across versions, but I suspect most of that looks something
>> > like "sed -i -e '/^squash! /d' COMMIT_EDITMSG" and it probably won't be
>> > affected.
>>
>> With the left-anchoring, the search pattern will no longer find that
>> line if "squash!" is commented out, but people tend to be sloppy and
>> do not anchor the pattern would not notice the difference. Perhaps
>> the downside may not be too severe? I dunno.
>
> Sorry, I was perhaps bad at explaining this. In my example, it would no
> longer remove that line, but the user wouldn't care, because it would be
> commented out and removed automatically. So while the code wouldn't
> work, what the user wanted would be done by Git automatically.
I didn't realize that you only care about 'd' there; you're right of
course if you limit the scope of the discussion that way.
I was talking in a more general terms where "^squash!" is used as a
marker that signals the boundary between two original commits and
the processing is done possibly differently on each part.
prev parent reply other threads:[~2020-01-08 16:53 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-06 16:04 [PATCH 0/1] sequencer: comment out the 'squash!' line Michael Rappazzo via GitGitGadget
2020-01-06 16:04 ` [PATCH 1/1] " Michael Rappazzo via GitGitGadget
2020-01-06 17:10 ` Phillip Wood
2020-01-06 17:34 ` Mike Rappazzo
2020-01-06 17:32 ` [PATCH 0/1] " Junio C Hamano
2020-01-06 19:20 ` Mike Rappazzo
2020-01-06 19:32 ` Jeff King
2020-01-07 3:36 ` Jonathan Nieder
2020-01-07 11:15 ` Jeff King
2020-01-06 20:41 ` Junio C Hamano
2020-01-07 1:34 ` brian m. carlson
2020-01-07 16:15 ` Junio C Hamano
2020-01-08 2:55 ` brian m. carlson
2020-01-08 13:23 ` Johannes Schindelin
2020-01-08 16:53 ` Junio C Hamano [this message]
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=xmqqv9pl3n65.fsf@gitster-ct.c.googlers.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=rappazzo@gmail.com \
--cc=sandals@crustytoothpaste.net \
/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.
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 NNTP newsgroup(s).