Re: [PATCH v2 3/8] checkout: validate stage and merge option compatibility in checkout_paths()
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Sep 2, 2026, 22:40 UTC
- Message-ID
- <xmqqo6efff9l.fsf@gitster.g>
- In-Reply-To
- <CAOLa=ZSQs5umaTxT6RKQJdnnAEbK+AHgj0n5yiTM0jsbZcyiig@mail.gmail.com>
Karthik Nayak <karthik.188@gmail.com> writes:
Show 7 quoted lines
> Sorry if I was unclear. I was stating that the condition udner which the > check runs is now difference. Previously we checked `opts->pathspec.nr`, > but now `checkout_paths()` is also entered for '--patch' without any > path spec. > > Having a closer look, it seems to be okay. Because in patch mode, each > of the combinations is already rejected before in `checkout_paths()`.
Yes, that was why I did not see what difference between the code before and after the change you were concerned about.
> It still might be good to have a sentence in a the commit message, since > the guard did change and the reasoning why that is safe is not so > obvious.
Perhaps.
Having done this, I do not particularly think these changes and refactorings are all that useful. As unit of reusable code, an entire command (like "git restore") may still be too coarse and callers would want a finer grained control out of "Git restore callable from C programmatically, without having to go through run_command() interface", which means the caller has to still formulate argv[] array in order to call them. These 8 patches may give us a good starting point, but it merely scratches the surface.