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

Re: [PATCH v2 1/2] mergetool: don't skip modify/remove conflicts

From
Martin von Zweigbergk <martin.von.zweigbergk@gmail.com>
Date
Feb 15, 2011, 03:30 UTC
Message-ID
<alpine.DEB.2.00.1102142204240.7843@debian>
In-Reply-To
<7v1v3aqfqm.fsf@alter.siamese.dyndns.org>
On Mon, 14 Feb 2011, Junio C Hamano wrote:
> But shouldn't you also revert the parts of my patch to do_plain_rerere()
> and rerere_forget() that have similar special cases?
Yep, done in patch 2/2.

Your changes in find_conflicts() are still there after patch 1/2 and since do_plain_rerere() and rerere_forget() call find_conflicts(), I think they need to check for the punted paths. Only the callers of setup_rerere() no longer need to care.

In patch 2/2, I refactored a bit more, so that find_conflicts() behaves the way it did before your first patch, and then the checks for punted paths are removed from the callers.

If you think the second one is good, it could easily be squashed with the first one. I left it separate because I wasn't quite sure. For example, could the interface to check_one_conflict() be improved? As you said, part of the changes from your patch are now undone, so I guess all three patches could even be squashed.

/Martin
Previous: Junio C HamanoNext: Junio C Hamano
Message 7 of 13 in “mergetool: don't skip modify/remove conflicts”
  1. mergetool: don't skip modify/remove conflictsMartin von Zweigbergk, Feb 8, 2011
  2. Junio C HamanoFeb 9, 2011
  3. Martin von ZweigbergkFeb 11, 2011
  4. 0/2 mergetool: don't skip modify/remove conflictsMartin von Zweigbergk, Feb 13, 2011
  5. 1/2 mergetool: don't skip modify/remove conflictsMartin von Zweigbergk, Feb 13, 2011
  6. Junio C HamanoFeb 15, 2011
  7. Martin von ZweigbergkFeb 15, 2011
  8. Junio C HamanoFeb 15, 2011
  9. 0/2 mergetool: don't skip modify/remove conflictsMartin von Zweigbergk, Feb 16, 2011
  10. 1/2 rerere "remaining"Martin von Zweigbergk, Feb 16, 2011
  11. Junio C HamanoFeb 16, 2011
  12. 2/2 mergetool: don't skip modify/remove conflictsMartin von Zweigbergk, Feb 16, 2011
  13. 2/2 rerere: factor out common conflict search codeMartin von Zweigbergk, Feb 13, 2011

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.