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

merge-recursive: Have conflict_rename_delete reuse modify/delete code 

Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Elijah Newren 2011-08-11 23:20:20 -06:00 committed by Junio C Hamano
parent b70332520d
commit e03acb8bc1
1 changed files with 30 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
merge-recursive.c
View File

@ -1037,24 +1037,38 @@ static void conflict_rename_delete(struct merge_options *o,
const char *rename_branch, const char *rename_branch,
const char *other_branch) const char *other_branch)
{ {
char *dest_name = pair->two->path; const struct diff_filespec *orig = pair->one;
int df_conflict = 0; const struct diff_filespec *dest = pair->two;
const char *path;
const unsigned char *a_sha = NULL;
const unsigned char *b_sha = NULL;
int a_mode = 0;
int b_mode = 0;


output(o, 1, "CONFLICT (rename/delete): Rename %s->%s in %s " if (rename_branch == o->branch1) {
"and deleted in %s", a_sha = dest->sha1;
pair->one->path, pair->two->path, rename_branch, a_mode = dest->mode;
other_branch); } else {
if (!o->call_depth) b_sha = dest->sha1;
update_stages(dest_name, NULL, b_mode = dest->mode;
rename_branch == o->branch1 ? pair->two : NULL,
rename_branch == o->branch1 ? NULL : pair->two);
if (dir_in_way(dest_name, !o->call_depth)) {
dest_name = unique_path(o, dest_name, rename_branch);
df_conflict = 1;
} }
update_file(o, 0, pair->two->sha1, pair->two->mode, dest_name);
if (df_conflict) if (o->call_depth) {
free(dest_name); remove_file_from_cache(dest->path);
path = orig->path;
} else {
path = dest->path;
update_stages(dest->path, NULL,
rename_branch == o->branch1 ? dest : NULL,
rename_branch == o->branch1 ? NULL : dest);
}

handle_change_delete(o,
path,
orig->sha1, orig->mode,
a_sha, a_mode,
b_sha, b_mode,
"rename", "renamed");
} }


static void conflict_rename_rename_1to2(struct merge_options *o, static void conflict_rename_rename_1to2(struct merge_options *o,