Quoting Matt Graham <mdg149@xxxxxxxxx>:
> 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@xxxxxxxxx>
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@xxxxxxxxxxxxxxx>
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@xxxxxxxxxxxxxxx>
Signed-off-by: Junio C Hamano <gitster@xxxxxxxxx>
--
Nanako Shiraishi
http://ivory.ap.teacup.com/nanako3/
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html