mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-04-19 20:33:57 +02:00
Code

Merge branch 'jz/apply-3way-first-message-fix' into next 

When we swapped the order of --3way fallback, we forgot to adjust
the message we give when the first method fails and the second
method is attempted (which used to be "direct application failed
hence we try 3way", now it is the other way around).

* jz/apply-3way-first-message-fix:
  apply: adjust messages to account for --3way changes
This commit is contained in:
Junio C Hamano 2021-04-30 14:12:01 +09:00
parent bede558f31 526705fd3d
commit 829167e135
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apply.c
View File

@ -3570,7 +3570,7 @@ static int try_threeway(struct apply_state *state,
read_blob_object(&buf, &pre_oid, patch->old_mode))
return error(_("repository lacks the necessary blob to perform 3-way merge."));
if (state->apply_verbosity > verbosity_silent)
if (state->apply_verbosity > verbosity_silent && patch->direct_to_threeway)
fprintf(stderr, _("Performing three-way merge...\n"));
img = strbuf_detach(&buf, &len);
@ -3637,6 +3637,10 @@ static int apply_data(struct apply_state *state, struct patch *patch,
return -1;
if (!state->threeway || try_threeway(state, &image, patch, st, ce) < 0) {
if (state->apply_verbosity > verbosity_silent &&
state->threeway && !patch->direct_to_threeway)
fprintf(stderr, _("Falling back to direct application...\n"));
/* Note: with --reject, apply_fragments() returns 0 */
if (patch->direct_to_threeway || apply_fragments(state, &image, patch) < 0)
return -1;