development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-10-28 19:25:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

merge-recursive: don't force external callers to do our logging

Browse source 
Alternatively, you can view this as "make the merge functions behave
more similarly."  merge-recursive has three different entry points:
merge_trees(), merge_recursive(), and merge_recursive_generic().  Two of
these would call diff_warn_rename_limit(), but merge_trees() didn't.
This lead to callers of merge_trees() needing to manually call
diff_warn_rename_limit() themselves.  Move this to the new
merge_finalize() function to make sure that all three entry points run
this function.

Note that there are two external callers of merge_trees(), one in
sequencer.c and one in builtin/checkout.c.  The one in sequencer.c is
cleaned up by this patch and just transfers where the call to
diff_warn_rename_limit() is made; the one in builtin/checkout.c is for
switching to a different commit and in the very rare case where the
warning might be triggered, it would probably be helpful to include
(e.g. if someone is modifying a file that has been renamed in moving to
the other commit, but there are so many renames between the commits that
the limit kicks in and none are detected, it may help to have an
explanation about why they got a delete/modify conflict instead of a
proper content merge in a renamed file).

Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Elijah Newren 2019-08-17 11:41:31 -07:00 committed by Junio C Hamano
parent b4db8a2b76
commit 345480d1ed
2 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
merge-recursive.c
View file

@ -3595,9 +3595,6 @@ static int merge_recursive_internal(struct merge_options *opt,
flush_output(opt);
if (!opt->call_depth && opt->buffer_output < 2)
strbuf_release(&opt->obuf);
if (show(opt, 2))
diff_warn_rename_limit("merge.renamelimit",
opt->needed_rename_limit, 0);
return clean;
}
@ -3617,7 +3614,9 @@ static int merge_start(struct merge_options *opt, struct tree *head)
static void merge_finalize(struct merge_options *opt)
{
/* Common code for wrapping up merges will be added here later */
if (show(opt, 2))
diff_warn_rename_limit("merge.renamelimit",
opt->needed_rename_limit, 0);
}
int merge_trees(struct merge_options *opt,

1
sequencer.c
View file

@ -617,7 +617,6 @@ static int do_recursive_merge(struct repository *r,
if (is_rebase_i(opts) && clean <= 0)
fputs(o.obuf.buf, stdout);
strbuf_release(&o.obuf);
diff_warn_rename_limit("merge.renamelimit", o.needed_rename_limit, 0);
if (clean < 0) {
rollback_lock_file(&index_lock);
return clean;