test-lib: introduce test_commit_bulk

diff --git a/merge-recursive.c b/merge-recursive.c
index a7bcfcbeb44679057a0429fd6641627796ad6d40..d2e380b7ed845e6fb2cd5616754a3f12a11c7b18 100644 (file)
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -1660,6 +1660,7 @@ static int handle_rename_add(struct merge_options *opt,
               c->path, add_branch);
 
        prev_path_desc = xstrfmt("version of %s from %s", path, a->path);
+       ci->ren1->src_entry->stages[other_stage].path = a->path;
        if (merge_mode_and_contents(opt, a, c,
                                    &ci->ren1->src_entry->stages[other_stage],
                                    prev_path_desc,