undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge-recursive: remove final remaining caller of merge_file_one()

Browse Source 
The function names merge_file_one() and merge_file_1() aren't
particularly intuitive function names, especially since there is no
associated merge_file() function that these are related to.  The
previous commit showed that merge_file_one() was prone to be called when
merge_file_1() should be, and since it is just a thin wrapper around
merge_file_1() anyway and only has one caller left, let's just remove
merge_file_one() entirely.

(It also turns out that the one remaining caller of merge_file_one()
has very broken code that needs to be completely rewritten, but that's
the subject of a future patch series; for now, we're just translating
it into a merge_file_1() call.)

Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Elijah Newren 2018-09-19 09:14:33 -07:00 committed by Junio C Hamano
parent 75f3fa79c3
commit 0270a07ad0
1 changed files with 17 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
merge-recursive.c
View File

@ -1366,27 +1366,6 @@ static int merge_file_1(struct merge_options *o,
return 0; return 0;
} }
static int merge_file_one(struct merge_options *o,
const char *path,
const struct object_id *o_oid, int o_mode,
const struct object_id *a_oid, int a_mode,
const struct object_id *b_oid, int b_mode,
const char *branch1,
const char *branch2,
struct merge_file_info *mfi)
{
struct diff_filespec one, a, b;
one.path = a.path = b.path = (char *)path;
oidcpy(&one.oid, o_oid);
one.mode = o_mode;
oidcpy(&a.oid, a_oid);
a.mode = a_mode;
oidcpy(&b.oid, b_oid);
b.mode = b_mode;
return merge_file_1(o, &one, &a, &b, path, branch1, branch2, mfi);
}
static int handle_rename_via_dir(struct merge_options *o, static int handle_rename_via_dir(struct merge_options *o,
struct diff_filepair *pair, struct diff_filepair *pair,
const char *rename_branch, const char *rename_branch,
@ -2730,12 +2709,23 @@ static int process_renames(struct merge_options *o,
ren1_dst, branch2); ren1_dst, branch2);
if (o->call_depth) { if (o->call_depth) {
struct merge_file_info mfi; struct merge_file_info mfi;
if (merge_file_one(o, ren1_dst, &null_oid, 0, struct diff_filespec one, a, b;
&ren1->pair->two->oid,
ren1->pair->two->mode, oidcpy(&one.oid, &null_oid);
&dst_other.oid, one.mode = 0;
dst_other.mode, one.path = ren1->pair->two->path;
branch1, branch2, &mfi)) {
oidcpy(&a.oid, &ren1->pair->two->oid);
a.mode = ren1->pair->two->mode;
a.path = one.path;
oidcpy(&b.oid, &dst_other.oid);
b.mode = dst_other.mode;
b.path = one.path;
if (merge_file_1(o, &one, &a, &b, ren1_dst,
branch1, branch2,
&mfi)) {
clean_merge = -1; clean_merge = -1;
goto cleanup_and_return; goto cleanup_and_return;
} }