]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: e9019fc) | patch
sequencer: teach autostash apply to report conflicts
authorHarald Nordgren <haraldnordgren@gmail.com>
Sat, 25 Jul 2026 15:34:28 +0000 (15:34 +0000)
committerJunio C Hamano <gitster@pobox.com>
Tue, 28 Jul 2026 22:08:18 +0000 (15:08 -0700)
commit64ffd57fb53718894b289d6919ee930000ebb330
tree05dc0354bffcb376e9881019d57da69f83b27a49tree | snapshot
parente9019fcafe0040228b8631c30f97ae1adb61bcdccommit | diff
sequencer: teach autostash apply to report conflicts

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.

Signed-off-by: Harald Nordgren <haraldnordgren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin/checkout.c diff | blob | blame | history
builtin/commit.c diff | blob | blame | history
builtin/merge.c diff | blob | blame | history
sequencer.c diff | blob | blame | history
sequencer.h diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.