From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Thu, 13 Mar 2008 23:40:05 GMT
Subject: Re: [PATCH] merge-recursive: handle file mode changes
Message-ID: <alpine.LSU.1.00.0803140039250.4174@racer.site>
In-Reply-To: <20080313224741.GA5000@localhost>

Hi,

On Thu, 13 Mar 2008, Clemens Buchacher wrote:

> @@ -1062,6 +1071,8 @@ static struct merge_file_info merge_file(struct diff_filespec *o,
>  		} else {
>  			die("unsupported object type in the tree");
>  		}
> +
> +		result.merge = !result.clean;

That is new.  Doesn't this overwrite what has been set in

        } else {
                if (!sha_eq(a->sha1, o->sha1) && !sha_eq(b->sha1, o->sha1))
                        result.merge = 1;

?

Ciao,
Dscho