Message ID | 73426c166877194d3c53a2ea250751318d223d21.1608056886.git.gitgitgadget@gmail.com (mailing list archive) |
---|---|
State | Accepted |
Commit | f1665e69188f54c941f9bf10ed388a72a91cc2a1 |
Headers | show |
Series | merge-ort: add basic rename detection | expand |
diff --git a/merge-ort.c b/merge-ort.c index 1c5b2f7e3b9..26f357e524f 100644 --- a/merge-ort.c +++ b/merge-ort.c @@ -870,7 +870,11 @@ static int process_renames(struct merge_options *opt, rename_branch, delete_branch); } else { /* normal rename */ - die("Not yet implemented"); + memcpy(&newinfo->stages[other_source_index], + &oldinfo->stages[other_source_index], + sizeof(newinfo->stages[0])); + newinfo->filemask |= (1 << other_source_index); + newinfo->pathnames[other_source_index] = oldpath; } }