From: Nanako Shiraishi <nanako3@lavabit.com>
Date: Sat, 16 May 2009 10:25:29 GMT
Subject: Re: [PATCH] new test fails "add -p" for adds on the top line
Message-ID: <20090516192529.6117@nanako3.lavabit.com>
In-Reply-To: <1c5969370905152010m486a8b85s96334e99e6c54ad5@mail.gmail.com>

Quoting Matt Graham <mdg149@gmail.com>:

> add -p doesn't work for some diffs.  diffs adding a new line at the top of
> the file with other adds later in the file are one way to trigger the problem.
>
> during add -p, split the diff and then answer y for all segments.  the file
> won't have been added to the index.
>
> Signed-off-by: Matthew Graham <mdg149@gmail.com>

I tried "git-add -p" from different versions and I found out that versions before the commit 0beee4c6dec15292415e3d56075c16a76a22af54 doesn't have this problem.

commit 0beee4c6dec15292415e3d56075c16a76a22af54
Author: Thomas Rast <trast@student.ethz.ch>
Date:   Wed Jul 2 23:59:44 2008 +0200

    git-add--interactive: remove hunk coalescing
    
    Current git-apply has no trouble at all applying chunks that have
    overlapping context, as produced by the splitting feature. So we can
    drop the manual coalescing.
    
    Signed-off-by: Thomas Rast <trast@student.ethz.ch>
    Signed-off-by: Junio C Hamano <gitster@pobox.com>

-- 
Nanako Shiraishi
http://ivory.ap.teacup.com/nanako3/