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

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

From
Junio C Hamano <gitster@pobox.com>
Date
Nov 10, 2014, 17:49 UTC
Message-ID
<xmqqbnof9c9d.fsf@gitster.dls.corp.google.com>
In-Reply-To
<20141109092344.4864.88180.chriscool@tuxfamily.org>
Christian Couder <chriscool@tuxfamily.org> writes:
Show 6 quoted lines
> Make sure we look for trailers before any conflict line
> by reusing the ignore_non_trailer() function.
>
> Helped-by: Junio C Hamano <gitster@pobox.com>
> Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
> ---

It makes sense to unify the logic to decide where the trailer block is, I would think. I however don't think I helped this change in any way, not more than "maintained the codebase as a solid foundation to build new features on", but at that point it would apply to any other change and not worth mentioning ;-).

Previous: Christian CouderNext: Christian Couder
Message 6 of 9 in “Small "git interpret-trailers" fixes”
  1. 0/5 Small "git interpret-trailers" fixesChristian Couder, Nov 9, 2014
  2. 1/5 trailer: ignore comment lines inside the trailersChristian Couder, Nov 9, 2014
  3. 2/5 trailer: display a trailer without its trailing newlineChristian Couder, Nov 9, 2014
  4. 3/5 commit: make ignore_non_trailer() non staticChristian Couder, Nov 9, 2014
  5. 4/5 trailer: reuse ignore_non_trailer() to ignore conflict linesChristian Couder, Nov 9, 2014
  6. Junio C HamanoNov 10, 2014
  7. Christian CouderNov 10, 2014
  8. Junio C HamanoNov 10, 2014
  9. 5/5 trailer: add test with an old style conflict blockChristian Couder, Nov 9, 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.