Re: [PATCH 1/2] sequencer: teach autostash apply to report conflicts
- From
Harald Nordgren <haraldnordgren@gmail.com>
- Date
- Aug 31, 2026, 10:18 UTC
- Message-ID
- <CAHwyqnVDBihNE8+tbJheO3R5TgfBUgqLHRx=zDxwT3btUi2NZA@mail.gmail.com>
- In-Reply-To
- <ec6c3986-94ab-4692-a4c2-47569b77e9ca@gmail.com>
Show 8 quoted lines
> > Add a conflicted parameter to apply_save_autostash_oid() and > > apply_save_autostash_ref() so callers can learn whether applying the > > stash resulted in conflicts. Thread the parameter through > > apply_autostash_ref() and update existing callers to pass NULL. > > It would be nicer to use the return value to indicate > success/error/conflicts rather than adding yet another parameter. Apart > from that this looks good.
Is the int flexible enough to separate autostash conflict from other errors? Or should we introduce an enum here?
Harald