apply: adjust messages to account for --3way changes
"git apply" specifically calls out when it is falling back to 3way merge application. Since the order changed to preferring 3way and falling back to direct application, continue that behavior by printing whenever 3way fails and git has to fall back. Signed-off-by: Jerry Zhang <jerry@skydio.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jerry Zhang committed
Apr 28, 2021 at 19:35 UTC
526705fd3d14a38646a12235ee385dcc0ffc7321
1 file changed
+5
-1
apply.c
+5
-1
@@ -3572,7 +3572,7 @@ static int try_threeway(struct apply_state *state,
3572
read_blob_object(&buf, &pre_oid, patch->old_mode))
3573
return error(_("repository lacks the necessary blob to perform 3-way merge."));
3574
3575
- if (state->apply_verbosity > verbosity_silent)
3575
+ if (state->apply_verbosity > verbosity_silent && patch->direct_to_threeway)
3576
fprintf(stderr, _("Performing three-way merge...\n"));
3577
3578
img = strbuf_detach(&buf, &len);
@@ -3639,6 +3639,10 @@ static int apply_data(struct apply_state *state, struct patch *patch,
3639
return -1;
3640
3641
if (!state->threeway || try_threeway(state, &image, patch, st, ce) < 0) {
3642
+ if (state->apply_verbosity > verbosity_silent &&
3643
+ state->threeway && !patch->direct_to_threeway)
3644
+ fprintf(stderr, _("Falling back to direct application...\n"));
3645
+
3646
/* Note: with --reject, apply_fragments() returns 0 */
3647
if (patch->direct_to_threeway || apply_fragments(state, &image, patch) < 0)
3648
return -1;