git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH 0/1] sequencer: comment out the 'squash!' line

From
brian m. carlson <sandals@crustytoothpaste.net>
Date
Jan 8, 2020, 02:55 UTC
Message-ID
<20200108025509.GM6570@camp.crustytoothpaste.net>
In-Reply-To
<xmqqlfqj6y5n.fsf@gitster-ct.c.googlers.com>
On 2020-01-07 at 16:15:16, Junio C Hamano wrote:
Show 11 quoted lines
> "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.

-- 
brian m. carlson: Houston, Texas, US
OpenPGP: https://keybase.io/bk2204
Previous: Junio C HamanoNext: Johannes Schindelin
Message 13 of 15 in “sequencer: comment out the 'squash!' line”
  1. 0/1 sequencer: comment out the 'squash!' lineMichael Rappazzo via GitGitGadget, Jan 6, 2020
  2. 1/1 sequencer: comment out the 'squash!' lineMichael Rappazzo via GitGitGadget, Jan 6, 2020
  3. Phillip WoodJan 6, 2020
  4. Mike RappazzoJan 6, 2020
  5. Junio C HamanoJan 6, 2020
  6. Mike RappazzoJan 6, 2020
  7. Jeff KingJan 6, 2020
  8. Jonathan NiederJan 7, 2020
  9. Jeff KingJan 7, 2020
  10. Junio C HamanoJan 6, 2020
  11. brian m. carlsonJan 7, 2020
  12. Junio C HamanoJan 7, 2020
  13. brian m. carlsonJan 8, 2020
  14. Johannes SchindelinJan 8, 2020
  15. Junio C HamanoJan 8, 2020

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.