Re: [PATCH 0/1] sequencer: comment out the 'squash!' line
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Jan 8, 2020, 16:53 UTC
- Message-ID
- <xmqqv9pl3n65.fsf@gitster-ct.c.googlers.com>
- In-Reply-To
- <20200108025509.GM6570@camp.crustytoothpaste.net>
"brian m. carlson" <sandals@crustytoothpaste.net> writes:
Show 17 quoted lines
> 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.