Re: [PATCH] Add a test-case for git-apply trying to add an ending line

From: Catalin Marinas <catalin.marinas@gmail.com>
Date: May 24, 2006, 13:32 UTC
Message-ID: <b0943d9e0605240632t4189f8d0yfdbab111c83f0426@mail.gmail.com>
In-Reply-To: <7v8xosqaqm.fsf@assigned-by-dhcp.cox.net>

On 24/05/06, Junio C Hamano <junkio@cox.net> wrote:

Show 5 quoted lines

> I'd admit that trying to apply a patch without context like the
> above example _is_ insane, and I realize that I am making this
> problem unsolvable by refusing the heuristics to consider that
> the patch is anchored at the end when we do not see any trailing
> context.  But somehow it feels wrong...

The reason I sent you this test is that GNU patch fails to apply the diff but git-apply succeeds (and I thought git-apply is more restrictive).

When there are context lines either before or after the "+" line, it should be OK to assume that the diff has context and therefore the EOF should be considered.

If there are no context lines at all, the diff is either without context or it is meant to patch an empty file. The latter is safer and probably valid for most of the cases but if you have a patch without context, you could explicitely pass the -C0 option to git-apply.

-- 
Catalin