From: Nanako Shiraishi <nanako3@lavabit.com>
To: Matt Graham <mdg149@gmail.com>
Cc: git@vger.kernel.org, Thomas Rast <trast@student.ethz.ch>
Subject: Re: [PATCH] new test fails "add -p" for adds on the top line
Date: Sat, 16 May 2009 19:25:29 +0900 [thread overview]
Message-ID: <20090516192529.6117@nanako3.lavabit.com> (raw)
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/
next prev parent reply other threads:[~2009-05-16 10:26 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-05-16 3:10 [PATCH] new test fails "add -p" for adds on the top line Matt Graham
2009-05-16 10:25 ` Nanako Shiraishi [this message]
2009-05-16 14:12 ` Thomas Rast
2009-05-16 17:48 ` Junio C Hamano
2009-05-16 17:55 ` Sverre Rabbelier
2009-05-16 19:13 ` Junio C Hamano
2009-05-16 19:14 ` Sverre Rabbelier
2009-05-16 19:51 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20090516192529.6117@nanako3.lavabit.com \
--to=nanako3@lavabit.com \
--cc=git@vger.kernel.org \
--cc=mdg149@gmail.com \
--cc=trast@student.ethz.ch \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.