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

Re: [PATCH 3/4] add: introduce '--resolved' option

From
Michael Montalbo <mmontalbo@gmail.com>
Date
Aug 3, 2026, 01:15 UTC
Message-ID
<CAC2Qwm+4qnAdUpinbda+etnFYUaYkycW-0HasHo95MM3rPY3yA@mail.gmail.com>
In-Reply-To
<xmqqfr0w2lnt.fsf@gitster.g>
On Sun, Aug 2, 2026 at 3:38 PM Junio C Hamano <gitster@pobox.com> wrote:
Show 10 quoted lines
>
>
> If we misidentify early, that is a desirable outcome, isn't it?
>
> We did not have to scan much and we gave control back to the user as
> soon as we saw "<<<<<<", telling them that we refused to add the path
> to the index, so that the user can inspect the situation more
> deeply.  In this application, false positives are much better than
> false negatives, and failing early is better than failing late.
>

I didn't fully consider the case of the false negative that would come with switching the order of the checks. I agree false positives are much better in this scenario.

Show 6 quoted lines
> So, no, I do not think so, even though in practice I do not think it
> would matter either way.
>
> A question that may have much more impact is whether the attribute
> system should have any say in this code path.  I am somewhat torn on
> this.

I do think something in that direction might make things more clear. When looking at "has_conflict_markers()" in isolation my instinct was to guard against the case that the file is binary (among other "easy" checks to eliminate non-conflict marker paths upfront) and return right away. That rested on the assumption the check for a binary file had an unambiguous result as opposed to being a heuristic.

Would it be possible to check the merge driver used and return early if a non-text driver was used? I tried tracing the path where conflict markers end up being generated and it seems like the binary and union drivers cannot emit conflict markers. That might be conceptually more straightforward and eliminate the need for a "buffer_is_binary()" check. Not sure if that would be brittle in the face of new merge drivers being added, but directly relating this conflict marker check with the drivers that emit those markers seems to make sense to me.

Previous: Junio C HamanoNext: Junio C Hamano
Message 12 of 30 in “git add --resolved”
  1. 0/4 git add --resolvedJunio C Hamano, Jul 28, 2026
  2. 1/4 merge-ll: consolidate conflict marker scanning logicJunio C Hamano, Jul 28, 2026
  3. 2/4 read-cache: add remove_file_from_index_with_flags()Junio C Hamano, Jul 28, 2026
  4. 3/4 add: introduce '--resolved' optionJunio C Hamano, Jul 28, 2026
  5. Michael MontalboJul 29, 2026
  6. Junio C HamanoJul 29, 2026
  7. Junio C HamanoJul 29, 2026
  8. Junio C HamanoAug 2, 2026
  9. Junio C HamanoJul 29, 2026
  10. Michael MontalboAug 2, 2026
  11. Junio C HamanoAug 2, 2026
  12. Michael MontalboAug 3, 2026
  13. 4/4 read-cache: reindentJunio C Hamano, Jul 28, 2026
  14. 0/4 git add --resolvedJunio C Hamano, Jul 29, 2026
  15. 1/4 read-cache: reindentJunio C Hamano, Jul 29, 2026
  16. 2/4 merge-ll: consolidate conflict marker scanning logicJunio C Hamano, Jul 29, 2026
  17. 3/4 read-cache: add remove_file_from_index_with_flags()Junio C Hamano, Jul 29, 2026
  18. 4/4 add: introduce '--resolved' optionJunio C Hamano, Jul 29, 2026
  19. Junio C HamanoJul 29, 2026
  20. Michael MontalboJul 29, 2026
  21. Junio C HamanoJul 30, 2026
  22. Michael MontalboAug 2, 2026
  23. 0/4 git add --resolvedJunio C Hamano, Jul 31, 2026
  24. 1/4 read-cache: reindentJunio C Hamano, Jul 31, 2026
  25. 2/4 merge-ll: consolidate conflict marker scanning logicJunio C Hamano, Jul 31, 2026
  26. 3/4 read-cache: add remove_file_from_index_with_flags()Junio C Hamano, Jul 31, 2026
  27. 4/4 add: introduce '--resolved' optionJunio C Hamano, Jul 31, 2026
  28. Jeff KingAug 1, 2026
  29. Junio C HamanoAug 1, 2026
  30. Junio C HamanoAug 1, 2026

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.