Re: correct git merge behavior or corner case?

From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Apr 21, 2009, 09:01 UTC
Message-ID: <alpine.DEB.1.00.0904211100350.10279@pacific.mpi-cbg.de>
In-Reply-To: <alpine.DEB.1.00.0904211055160.10279@pacific.mpi-cbg.de>

Hi,

On Tue, 21 Apr 2009, Johannes Schindelin wrote:

> I actually agree with Junio, though, that we want this special handling 
> of empty files only in merge-recursive.

And this _might_ be enough (not even compile-tested due to lack of time; the OP did not provide the test as a proper patch):

---

 merge-recursive.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/merge-recursive.c b/merge-recursive.c
index 774bacd..b7ea3cd 100644
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -343,7 +343,7 @@ static struct string_list *get_renames(struct merge_options *o,
 		struct string_list_item *item;
 		struct rename *re;
 		struct diff_filepair *pair = diff_queued_diff.queue[i];
-		if (pair->status != 'R') {
+		if (pair->status != 'R' || !re->pair->one->size) {
 			diff_free_filepair(pair);
 			continue;
 		}