Subject: Re: correct git merge behavior or corner case?

From: Michał Kiedrowicz <[email-masked]>
Date: Tue, 21 Apr 2009 19:54:34 +0200

Johannes Schindelin <[email-masked]> wrote:

> 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;
>  		}
> --

And here is a test case:

---

 t/t6035-merge-suspected-rename.sh |   33 +++++++++++++++++++++++++++++++++
 1 files changed, 33 insertions(+), 0 deletions(-)

diff --git a/t/t6035-merge-suspected-rename.sh b/t/t6035-merge-suspected-rename.sh
new file mode 100755
index 0000000..81615fd
--- /dev/null
+++ b/t/t6035-merge-suspected-rename.sh
@@ -0,0 +1,33 @@
+#!/bin/sh
+
+test_description='Merge-recursive merging suspected rename'
+. ./test-lib.sh
+
+test_expect_success 'setup' '
+	echo "hello" > date &&
+	git add date &&
+	git commit -m initial &&
+
+	git branch parallel &&
+
+	echo "hello" > LICENSE &&
+	cp LICENSE LICENSE-copy &&
+	git add LICENSE &&
+	git commit -m LICENSE &&
+
+	git rm date &&
+	git commit -m removed &&
+
+	git checkout parallel &&
+	date > date &&
+	git add date &&
+	git commit -m date
+'
+
+test_expect_success 'merge' '
+	git checkout master &&
+	test_must_fail git merge parallel &&
+	test_cmp LICENSE LICENSE-copy
+'
+
+test_done