From: Phillip Wood Date: Thu, 27 Aug 2026 13:01:33 GMT Subject: Re: [PATCH 1/2] sequencer: teach autostash apply to report conflicts Message-ID: In-Reply-To: Hi Harald On 25/07/2026 16:34, Harald Nordgren via GitGitGadget wrote: > From: Harald Nordgren > > 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. Thanks Phillip > Signed-off-by: Harald Nordgren > --- > builtin/checkout.c | 3 ++- > builtin/commit.c | 2 +- > builtin/merge.c | 6 +++--- > sequencer.c | 29 +++++++++++++++++++---------- > sequencer.h | 3 ++- > 5 files changed, 27 insertions(+), 16 deletions(-) > > diff --git a/builtin/checkout.c b/builtin/checkout.c > index aee84ca897..72aafa4049 100644 > --- a/builtin/checkout.c > +++ b/builtin/checkout.c > @@ -1242,7 +1242,8 @@ static int switch_branches(const struct checkout_opts *opts, > new_branch_info->name, > "local", > stash_label_base, > - autostash_msg.buf); > + autostash_msg.buf, > + NULL); > } > if (ret) { > branch_info_release(&old_branch_info); > diff --git a/builtin/commit.c b/builtin/commit.c > index 28f6174503..d678a81865 100644 > --- a/builtin/commit.c > +++ b/builtin/commit.c > @@ -1980,7 +1980,7 @@ int cmd_commit(int argc, > } > > apply_autostash_ref(the_repository, "MERGE_AUTOSTASH", > - NULL, NULL, NULL, NULL); > + NULL, NULL, NULL, NULL, NULL); > > cleanup: > free_commit_extra_headers(extra); > diff --git a/builtin/merge.c b/builtin/merge.c > index 5b46a596f0..cecb8fb716 100644 > --- a/builtin/merge.c > +++ b/builtin/merge.c > @@ -538,7 +538,7 @@ static void finish(struct commit *head_commit, > > if (new_head) > apply_autostash_ref(the_repository, "MERGE_AUTOSTASH", > - NULL, NULL, NULL, NULL); > + NULL, NULL, NULL, NULL, NULL); > strbuf_release(&reflog_message); > } > > @@ -1680,7 +1680,7 @@ int cmd_merge(int argc, > &commit->object.oid, > overwrite_ignore)) { > apply_autostash_ref(the_repository, "MERGE_AUTOSTASH", > - NULL, NULL, NULL, NULL); > + NULL, NULL, NULL, NULL, NULL); > ret = 1; > goto done; > } > @@ -1844,7 +1844,7 @@ int cmd_merge(int argc, > fprintf(stderr, _("Merge with strategy %s failed.\n"), > use_strategies[0]->name); > apply_autostash_ref(the_repository, "MERGE_AUTOSTASH", > - NULL, NULL, NULL, NULL); > + NULL, NULL, NULL, NULL, NULL); > ret = 2; > goto done; > } else if (best_strategy == wt_strategy) > diff --git a/sequencer.c b/sequencer.c > index 1355a99a09..91a70e39a1 100644 > --- a/sequencer.c > +++ b/sequencer.c > @@ -4748,7 +4748,8 @@ void create_autostash_ref(struct repository *r, const char *refname, > static int apply_save_autostash_oid(const char *stash_oid, int attempt_apply, > const char *label_ours, const char *label_theirs, > const char *label_base, > - const char *stash_msg) > + const char *stash_msg, > + bool *conflicted) > { > struct child_process child = CHILD_PROCESS_INIT; > int ret = 0; > @@ -4783,14 +4784,16 @@ static int apply_save_autostash_oid(const char *stash_oid, int attempt_apply, > strvec_push(&store.args, stash_oid); > if (run_command(&store)) > ret = error(_("cannot store %s"), stash_oid); > - else if (attempt_apply) > + else if (attempt_apply) { > + if (conflicted) > + *conflicted = true; > fprintf(stderr, > _("Your local changes are stashed, however applying them\n" > "resulted in conflicts. You can either resolve the conflicts\n" > "and then discard the stash with \"git stash drop\", or, if you\n" > "do not want to resolve them now, run \"git reset --hard\" and\n" > "apply the local changes later by running \"git stash pop\".\n")); > - else > + } else > fprintf(stderr, > _("Autostash exists; creating a new stash entry.\n" > "Your changes are safe in the stash.\n" > @@ -4814,7 +4817,7 @@ static int apply_save_autostash(const char *path, int attempt_apply) > strbuf_trim(&stash_oid); > > ret = apply_save_autostash_oid(stash_oid.buf, attempt_apply, > - NULL, NULL, NULL, NULL); > + NULL, NULL, NULL, NULL, NULL); > > unlink(path); > strbuf_release(&stash_oid); > @@ -4833,19 +4836,24 @@ int apply_autostash(const char *path) > > int apply_autostash_oid(const char *stash_oid) > { > - return apply_save_autostash_oid(stash_oid, 1, NULL, NULL, NULL, NULL); > + return apply_save_autostash_oid(stash_oid, 1, NULL, NULL, NULL, NULL, > + NULL); > } > > static int apply_save_autostash_ref(struct repository *r, const char *refname, > int attempt_apply, > const char *label_ours, const char *label_theirs, > const char *label_base, > - const char *stash_msg) > + const char *stash_msg, > + bool *conflicted) > { > struct object_id stash_oid; > char stash_oid_hex[GIT_MAX_HEXSZ + 1]; > int flag, ret; > > + if (conflicted) > + *conflicted = false; > + > if (!refs_ref_exists(get_main_ref_store(r), refname)) > return 0; > > @@ -4858,7 +4866,7 @@ static int apply_save_autostash_ref(struct repository *r, const char *refname, > oid_to_hex_r(stash_oid_hex, &stash_oid); > ret = apply_save_autostash_oid(stash_oid_hex, attempt_apply, > label_ours, label_theirs, label_base, > - stash_msg); > + stash_msg, conflicted); > > refs_delete_ref(get_main_ref_store(r), "", refname, > &stash_oid, REF_NO_DEREF); > @@ -4869,16 +4877,17 @@ static int apply_save_autostash_ref(struct repository *r, const char *refname, > int save_autostash_ref(struct repository *r, const char *refname) > { > return apply_save_autostash_ref(r, refname, 0, > - NULL, NULL, NULL, NULL); > + NULL, NULL, NULL, NULL, NULL); > } > > int apply_autostash_ref(struct repository *r, const char *refname, > const char *label_ours, const char *label_theirs, > - const char *label_base, const char *stash_msg) > + const char *label_base, const char *stash_msg, > + bool *conflicted) > { > return apply_save_autostash_ref(r, refname, 1, > label_ours, label_theirs, label_base, > - stash_msg); > + stash_msg, conflicted); > } > > static int checkout_onto(struct repository *r, struct replay_opts *opts, > diff --git a/sequencer.h b/sequencer.h > index 64a9c7fb1b..b39528b6d0 100644 > --- a/sequencer.h > +++ b/sequencer.h > @@ -237,7 +237,8 @@ int apply_autostash(const char *path); > int apply_autostash_oid(const char *stash_oid); > int apply_autostash_ref(struct repository *r, const char *refname, > const char *label_ours, const char *label_theirs, > - const char *label_base, const char *stash_msg); > + const char *label_base, const char *stash_msg, > + bool *conflicted); > > #define SUMMARY_INITIAL_COMMIT (1 << 0) > #define SUMMARY_SHOW_AUTHOR_DATE (1 << 1)