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

Re: [PATCH] unpack-trees: don't shift conflicts left and right

From
René Scharfe <rene.scharfe@lsrfire.ath.cx>
Date
Jun 18, 2013, 19:33 UTC
Message-ID
<51C0B605.10908@lsrfire.ath.cx>
In-Reply-To
<7vsj0g9udh.fsf@alter.siamese.dyndns.org>
Am 18.06.2013 01:42, schrieb Junio C Hamano:
> But the need to go all the way up in the recursive callframes to get
> the union of bitmask to get conflicts looks somewhat ugly.

Yes, that's not pretty. It's like make_traverse_path in that regard, though, so it fits in somehow.

I suspect the *real* solution is to put something like traverse_trees_recursive into tree-walk.c. Both callers of traverse_tree recurse into subdirectories in slightly different ways. Providing that functionality in a central place should reduce code duplication.

René
Previous: Junio C Hamano
Message 9 of 9 in “unpack-trees: don't shift conflicts left and right”
  1. unpack-trees: don't shift conflicts left and rightRené Scharfe, Jun 15, 2013
  2. Junio C HamanoJun 16, 2013
  3. René ScharfeJun 17, 2013
  4. Junio C HamanoJun 17, 2013
  5. René ScharfeJun 17, 2013
  6. Junio C HamanoJun 17, 2013
  7. René ScharfeJun 17, 2013
  8. Junio C HamanoJun 17, 2013
  9. René ScharfeJun 18, 2013

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.