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

Re: [PATCH 4/5] trailer: reuse ignore_non_trailer() to ignore conflict lines

From
Junio C Hamano <gitster@pobox.com>
Date
Nov 9, 2014, 16:45 UTC
Message-ID
<xmqqfvdse308.fsf@gitster.dls.corp.google.com>
In-Reply-To
<20141109.113509.1363113947439404678.chriscool@tuxfamily.org>
Christian Couder <chriscool@tuxfamily.org> writes:
Show 5 quoted lines
> Yeah, it won't be as efficient as using only one strbuf and only byte
> oriented functions, and it looks much less manly too :-) But over time in
> Git we have developed a number of less efficient but quite clean
> abstractions like strbuf, argv_array, sha1_array and so on, that we
> are quite happy with.

Actually, all these examples you gave are fairly efficient and clean abstractions. I find it insulting to pretend that the "one line per strbuf" is in the same league. It isn't.

And it is not about manliness.
Previous: Christian CouderNext: Junio C Hamano
Message 10 of 13 in “Small "git interpret-trailers" fixes”
  1. 0/5 Small "git interpret-trailers" fixesChristian Couder, Nov 7, 2014
  2. 1/5 trailer: ignore comment lines inside the trailersChristian Couder, Nov 7, 2014
  3. 2/5 trailer: display a trailer without its trailing newlineChristian Couder, Nov 7, 2014
  4. Jeff KingNov 7, 2014
  5. Junio C HamanoNov 7, 2014
  6. 3/5 commit: make ignore_non_trailer() non staticChristian Couder, Nov 7, 2014
  7. 4/5 trailer: reuse ignore_non_trailer() to ignore conflict linesChristian Couder, Nov 7, 2014
  8. Junio C HamanoNov 7, 2014
  9. Christian CouderNov 9, 2014
  10. Junio C HamanoNov 9, 2014
  11. Junio C HamanoNov 9, 2014
  12. Junio C HamanoNov 9, 2014
  13. 5/5 trailer: add test with an old style conflict blockChristian Couder, Nov 7, 2014

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.