From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Sun, 25 Jun 2006 02:04:48 GMT
Subject: Re: [PATCH 1/3] rebase: allow --merge option to handle patches merged upstream
Message-ID: <Pine.LNX.4.63.0606250401490.29667@wbgn013.biozentrum.uni-wuerzburg.de>
In-Reply-To: <11511989902239-git-send-email-normalperson@yhbt.net>

Hi,

On Sat, 24 Jun 2006, Eric Wong wrote:

> +		if test -n "`git-diff-index HEAD`"

This is not a sufficient test if the patch was already merged to upstream. 
For example, you can have two patches which touched the same file, and one 
of them was applied to upstream, the other not. The test fails to see 
that. Or am I missing something?

Ciao,
Dscho