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

merge-recursive: Record more data needed for merging with dual renames 

When two different files are renamed to one, we need to be able to do
three-way merges for both of those files.  To do that, we need to record
the sha1sum of the (possibly modified) file on the unrenamed side.  Modify
setup_rename_conflict_info() to take this extra information and record it
when the rename_type is RENAME_TWO_FILES_TO_ONE.

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:16 -06:00 committed by Junio C Hamano
parent 461f504117
commit 232c635f7e
1 changed files with 39 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
merge-recursive.c
View File

@ -79,6 +79,8 @@ struct rename_conflict_info {
const char *branch2; const char *branch2;
struct stage_data *dst_entry1; struct stage_data *dst_entry1;
struct stage_data *dst_entry2; struct stage_data *dst_entry2;
struct diff_filespec ren1_other;
struct diff_filespec ren2_other;
}; };


/* /*
@ -100,7 +102,10 @@ static inline void setup_rename_conflict_info(enum rename_type rename_type,
const char *branch1, const char *branch1,
const char *branch2, const char *branch2,
struct stage_data *dst_entry1, struct stage_data *dst_entry1,
struct stage_data *dst_entry2) struct stage_data *dst_entry2,
struct merge_options *o,
struct stage_data *src_entry1,
struct stage_data *src_entry2)
{ {
struct rename_conflict_info *ci = xcalloc(1, sizeof(struct rename_conflict_info)); struct rename_conflict_info *ci = xcalloc(1, sizeof(struct rename_conflict_info));
ci->rename_type = rename_type; ci->rename_type = rename_type;
@ -118,6 +123,24 @@ static inline void setup_rename_conflict_info(enum rename_type rename_type,
ci->pair2 = pair2; ci->pair2 = pair2;
dst_entry2->rename_conflict_info = ci; dst_entry2->rename_conflict_info = ci;
} }

if (rename_type == RENAME_TWO_FILES_TO_ONE) {
/*
* For each rename, there could have been
* modifications on the side of history where that
* file was not renamed.
*/
int ostage1 = o->branch1 == branch1 ? 3 : 2;
int ostage2 = ostage1 ^ 1;

ci->ren1_other.path = pair1->one->path;
hashcpy(ci->ren1_other.sha1, src_entry1->stages[ostage1].sha);
ci->ren1_other.mode = src_entry1->stages[ostage1].mode;

ci->ren2_other.path = pair2->one->path;
hashcpy(ci->ren2_other.sha1, src_entry2->stages[ostage2].sha);
ci->ren2_other.mode = src_entry2->stages[ostage2].mode;
}
} }


static int show(struct merge_options *o, int v) static int show(struct merge_options *o, int v)
@ -1158,7 +1181,10 @@ static int process_renames(struct merge_options *o,
branch1, branch1,
branch2, branch2,
ren1->dst_entry, ren1->dst_entry,
ren2->dst_entry); ren2->dst_entry,
o,
NULL,
NULL);
} else if ((lookup = string_list_lookup(renames2Dst, ren1_dst))) { } else if ((lookup = string_list_lookup(renames2Dst, ren1_dst))) {
/* Two different files renamed to the same thing */ /* Two different files renamed to the same thing */
char *ren2_dst; char *ren2_dst;
@ -1182,7 +1208,11 @@ static int process_renames(struct merge_options *o,
branch1, branch1,
branch2, branch2,
ren1->dst_entry, ren1->dst_entry,
ren2->dst_entry); ren2->dst_entry,
o,
ren1->src_entry,
ren2->src_entry);

} else { } else {
/* Renamed in 1, maybe changed in 2 */ /* Renamed in 1, maybe changed in 2 */
/* we only use sha1 and mode of these */ /* we only use sha1 and mode of these */
@ -1218,6 +1248,9 @@ static int process_renames(struct merge_options *o,
branch1, branch1,
branch2, branch2,
ren1->dst_entry, ren1->dst_entry,
NULL,
o,
NULL,
NULL); NULL);
} 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)) {
@ -1269,6 +1302,9 @@ static int process_renames(struct merge_options *o,
branch1, branch1,
NULL, NULL,
ren1->dst_entry, ren1->dst_entry,
NULL,
o,
NULL,
NULL); NULL);
} }
} }