From: Junio C Hamano <gitster@pobox.com>
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Cc: git@vger.kernel.org
Subject: Re: add -e, was Re: What's cooking in git.git (Apr 2009, #02; Sun, 12)
Date: Tue, 14 Apr 2009 11:40:33 -0700 [thread overview]
Message-ID: <7vhc0r3wpq.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: <alpine.DEB.1.00.0904141943060.10279@pacific.mpi-cbg.de> (Johannes Schindelin's message of "Tue, 14 Apr 2009 19:48:55 +0200 (CEST)")
Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:
> On Sun, 12 Apr 2009, Junio C Hamano wrote:
>
>> * js/add-edit (Wed Apr 8 23:30:24 2009 +0200) 1 commit
>> - git-add: introduce --edit (to edit the diff vs. the index)
>>
>> I am Ok with the general idea, but the error detection needs to be more
>> robust than merely relying on --recount.
>
> You mean something like saving an extra copy of the patch, and checking if
> common or removed lines were either removed or kept intact?
No, editing a removed line and changing it to an unchanged line is
perfectly fine.
I was thinking more about people touching the lines near the hunk boundary
(e.g. insert a new line at the beginning of the hunk) which would not be
compatible without --unidiff-zero hack while applying, and --unidiff-zero
hack should not be used if we care about the correctness.
next prev parent reply other threads:[~2009-04-14 18:42 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-04-13 2:50 What's cooking in git.git (Apr 2009, #02; Sun, 12) Junio C Hamano
2009-04-14 17:48 ` add -e, was " Johannes Schindelin
2009-04-14 18:40 ` Junio C Hamano [this message]
2009-04-14 20:25 ` Johannes Schindelin
2009-04-14 22:31 ` Junio C Hamano
2009-04-16 13:12 ` Johannes Schindelin
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=7vhc0r3wpq.fsf@gitster.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
/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 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 NNTP newsgroup(s).