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

merge-recursive: add handling for rename/rename/add-dest/add-dest

Browse Source 
Each side of the rename in rename/rename(1to2) could potentially also be
involved in a rename/add conflict.  Ensure stages for such conflicts are
also recorded.

Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Elijah Newren 2011-08-11 23:20:21 -06:00 committed by Junio C Hamano
parent e03acb8bc1
commit 1ac91b32b5
2 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
merge-recursive.c
View File

@ -1071,6 +1071,19 @@ static void conflict_rename_delete(struct merge_options *o,
"rename", "renamed"); "rename", "renamed");
} }
static struct diff_filespec *filespec_from_entry(struct diff_filespec *target,
struct stage_data *entry,
int stage)
{
unsigned char *sha = entry->stages[stage].sha;
unsigned mode = entry->stages[stage].mode;
if (mode == 0 || is_null_sha1(sha))
return NULL;
hashcpy(target->sha1, sha);
target->mode = mode;
return target;
}
static void conflict_rename_rename_1to2(struct merge_options *o, static void conflict_rename_rename_1to2(struct merge_options *o,
struct rename_conflict_info *ci) struct rename_conflict_info *ci)
{ {
@ -1116,8 +1129,12 @@ static void conflict_rename_rename_1to2(struct merge_options *o,
remove_file_from_cache(a->path); remove_file_from_cache(a->path);
remove_file_from_cache(b->path); remove_file_from_cache(b->path);
} else { } else {
update_stages(a->path, NULL, a, NULL); struct diff_filespec other;
update_stages(b->path, NULL, NULL, b); update_stages(a->path, NULL,
a, filespec_from_entry(&other, ci->dst_entry1, 3));
update_stages(b->path, NULL,
filespec_from_entry(&other, ci->dst_entry2, 2), b);
update_file(o, 0, a->sha1, a->mode, dst_name_a); update_file(o, 0, a->sha1, a->mode, dst_name_a);
update_file(o, 0, b->sha1, b->mode, dst_name_b); update_file(o, 0, b->sha1, b->mode, dst_name_b);

2
t/t6042-merge-rename-corner-cases.sh
View File

@ -551,7 +551,7 @@ test_expect_success 'setup rename/rename(1to2)/add-dest conflict' '
git commit -m two git commit -m two
' '
test_expect_failure 'rename/rename/add-dest merge still knows about conflicting file versions' ' test_expect_success 'rename/rename/add-dest merge still knows about conflicting file versions' '
git checkout C^0 && git checkout C^0 &&
test_must_fail git merge -s recursive B^0 && test_must_fail git merge -s recursive B^0 &&