From: Elijah Newren Date: Mon, 21 Mar 2011 18:30:56 GMT Subject: [WIP PATCH 02/10] Reminder to fix o->call_depth handling in conflict_rename_rename_1to2 Message-ID: <1300732264-9638-3-git-send-email-newren@gmail.com> In-Reply-To: <1300732264-9638-1-git-send-email-newren@gmail.com> --- merge-recursive.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/merge-recursive.c b/merge-recursive.c index 6dc74dc..8d28a54 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -908,6 +908,10 @@ static void conflict_rename_rename_1to2(struct merge_options *o, ren2_dst, branch1, dst_name2); } if (o->call_depth) { + /* + * FIXME: This is bogus. dst_nameX are not in cache in + * case of D/F conflict. + */ remove_file_from_cache(dst_name1); remove_file_from_cache(dst_name2); /* -- 1.7.4