kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

merge-recursive: Move rename/delete handling into dedicated function 

This move is in preparation for the function growing and being called from
multiple places in order to handle D/F conflicts.

Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Elijah Newren 2010-09-20 02:28:50 -06:00 committed by Junio C Hamano
parent 605c1bcfc4
commit 6ef2cb008f
1 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
merge-recursive.c
View File

@ -730,6 +730,25 @@ static struct merge_file_info merge_file(struct merge_options *o,
return result; return result;
} }


static void conflict_rename_delete(struct merge_options *o,
struct diff_filepair *pair,
const char *rename_branch,
const char *other_branch)
{
char *dest_name = pair->two->path;

output(o, 1, "CONFLICT (rename/delete): Rename %s->%s in %s "
"and deleted in %s",
pair->one->path, pair->two->path, rename_branch,
other_branch);
if (!o->call_depth)
update_stages(dest_name, NULL,
rename_branch == o->branch1 ? pair->two : NULL,
rename_branch == o->branch1 ? NULL : pair->two,
1);
update_file(o, 0, pair->two->sha1, pair->two->mode, dest_name);
}

static void conflict_rename_rename_1to2(struct merge_options *o, static void conflict_rename_rename_1to2(struct merge_options *o,
struct rename *ren1, struct rename *ren1,
const char *branch1, const char *branch1,
@ -936,17 +955,7 @@ static int process_renames(struct merge_options *o,


if (sha_eq(src_other.sha1, null_sha1)) { if (sha_eq(src_other.sha1, null_sha1)) {
clean_merge = 0; clean_merge = 0;
output(o, 1, "CONFLICT (rename/delete): Rename %s->%s in %s " conflict_rename_delete(o, ren1->pair, branch1, branch2);
"and deleted in %s",
ren1_src, ren1_dst, branch1,
branch2);
update_file(o, 0, ren1->pair->two->sha1, ren1->pair->two->mode, ren1_dst);
if (!o->call_depth)
update_stages(ren1_dst, NULL,
branch1 == o->branch1 ?
ren1->pair->two : NULL,
branch1 == o->branch1 ?
NULL : ren1->pair->two, 1);
} else if ((dst_other.mode == ren1->pair->two->mode) && } else if ((dst_other.mode == ren1->pair->two->mode) &&
sha_eq(dst_other.sha1, ren1->pair->two->sha1)) { sha_eq(dst_other.sha1, ren1->pair->two->sha1)) {
/* Added file on the other side /* Added file on the other side