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

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

From
Junio C Hamano <gitster@pobox.com>
Date
Aug 2, 2026, 02:23 UTC
Message-ID
<xmqq4ihd5khl.fsf@gitster.g>
In-Reply-To
<xmqq8q6tc3cy.fsf@gitster.g>
Junio C Hamano <gitster@pobox.com> writes:
Show 11 quoted lines
>> I wonder if we should simply write 'addremove', as this part of the
>> change is about rewriting the open-coded die_for_incompatible_opt2()
>> in the original and using die_for_incompatible_opt3() to add a third
>> option.
>
> Not really.  I forgot that addremove is futzed before this part when
> add_resolved is present, so using addremove would mean both
> addremove and add_resolved are on, mistakenly complaining about -A
> that the user never gave us.
>
> So "0 < addremove_explicit" that is.

Well, this episode illustrates that the option parsing in "git add" is unnecessarily confusing, and I think the reason is because it conflates the presence of each command line option and the behaviour the program wants to exhibit into the same variable. addremove for example is about "removals are also recorded in the index", and that becomes effective primarily when "-A" option is given, but "-A" is not the only thing to turn it on.

Perhaps revamping the way the options are parsed so that the incompatible options are noticed upfront, and then deciding the behaviour based on the primary operating mode that was parsed by the ooption parser in a separate step might make things less confusing?

Previous: Junio C HamanoNext: Junio C Hamano
Message 8 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.