From: Junio C Hamano <gitster@pobox.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Arnaud Lacombe <lacombar@gmail.com>, git@vger.kernel.org
Subject: "add -p" breakage
Date: Wed, 06 Apr 2011 13:09:09 -0700 [thread overview]
Message-ID: <7v4o6bi1lm.fsf_-_@alter.siamese.dyndns.org> (raw)
In-Reply-To: <7voc4ji23p.fsf@alter.siamese.dyndns.org> (Junio C. Hamano's message of "Wed, 06 Apr 2011 12:58:18 -0700")
Junio C Hamano <gitster@pobox.com> writes:
> Arnaud Lacombe <lacombar@gmail.com> writes:
>
>> This commit introduces a regression when editing splithunks using "git
>> add -p". Reverting the patch fix the regression.
>
> Thanks for a report. I don't have a time to look at this now; help from
> "add -p" people would be appreciated.
>
> I have a suspicion that the symptom may be a bug in "add -p" exposed by
> the change; "add -p" which used to count the patch lines carefully itself,
> but was modified to use 'apply --recount' in more recent versions.
Sorry, not that one, but what "add -p" used to carefully do but punts
these days is to combine adjacent hunks correctly. I suspect that
laziness is coming back and haunt us, and if that is the case, we should
fix it there, and should not work it around by breaking the normal patch
application codepath.
next prev parent reply other threads:[~2011-04-06 20:09 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-04-03 8:36 [ANNOUNCE] Git 1.7.4.3 Junio C Hamano
2011-04-06 18:40 ` Arnaud Lacombe
2011-04-06 19:58 ` Junio C Hamano
2011-04-06 20:09 ` Junio C Hamano [this message]
2011-04-06 21:31 ` [PATCH] add--interactive.perl: factor out repeated --recount option Junio C Hamano
2011-04-06 21:36 ` [PATCH] "add -p": work-around an old laziness that does not coalesce hunks 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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7v4o6bi1lm.fsf_-_@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=lacombar@gmail.com \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).