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

Re: [PATCH] format-patch: dereference tags with --ignore-if-in-upstream

From
Jeff King <peff@peff.net>
Date
Jun 1, 2015, 17:47 UTC
Message-ID
<20150601174712.GA18364@peff.net>
In-Reply-To
<xmqq6177728a.fsf@gitster.dls.corp.google.com>
On Mon, Jun 01, 2015 at 10:44:21AM -0700, Junio C Hamano wrote:
Show 8 quoted lines
> > Shouldn't you ensure o1 and o2 are commits here?
> 
> Heh, I should have read the remainder of the thread before
> responding.
> 
> How about doing it this way?  We know and trust that existing
> revision traversal machinery is doing the right thing, and it is
> only that the clear_commit_marks() calls are botched.
Yeah, I think this matches the recommendation I gave in the last round.

I do still think we could get rid of this "second" traversal entirely in favor of using "--cherry", but that is a much larger topic. Even if somebody wants to pursue that, the immediate fix should look like this.

-Peff
Previous: Junio C HamanoNext: Junio C Hamano
Message 14 of 21 in “seg fault in "git format-patch"”
  1. Bruce KorbMay 31, 2015
  2. Christian CouderMay 31, 2015
  3. Bruce KorbMay 31, 2015
  4. Bruce KorbMay 31, 2015
  5. Christian CouderMay 31, 2015
  6. Christian CouderMay 31, 2015
  7. Christian CouderJun 1, 2015
  8. format-patch: dereference tags with --ignore-if-in-upstreambrian m. carlson, Jun 1, 2015
  9. Jeff KingJun 1, 2015
  10. brian m. carlsonJun 1, 2015
  11. Jeff KingJun 1, 2015
  12. Junio C HamanoJun 1, 2015
  13. Junio C HamanoJun 1, 2015
  14. Jeff KingJun 1, 2015
  15. Junio C HamanoJun 1, 2015
  16. brian m. carlsonJun 1, 2015
  17. Junio C HamanoJun 1, 2015
  18. Junio C HamanoJun 1, 2015
  19. Christian CouderJun 1, 2015
  20. Christian CouderJun 1, 2015
  21. Bruce KorbJun 1, 2015

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.