git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: add -e, was Re: What's cooking in git.git (Apr 2009, #02; Sun, 12)

From
Johannes Schindelin <johannes.schindelin@gmx.de>
Date
Apr 14, 2009, 20:25 UTC
Message-ID
<alpine.DEB.1.00.0904142224030.10279@pacific.mpi-cbg.de>
In-Reply-To
<7vhc0r3wpq.fsf@gitster.siamese.dyndns.org>
Hi,
On Tue, 14 Apr 2009, Junio C Hamano wrote:
Show 21 quoted lines
> 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.

Actually, I am beginning to hate the idea of having this in add -e, but would prefer it to be in apply ("git apply $PATCH" could -- and should -- complain when not being called with --unidiff-zero and encountering a patch that should (but does not) have common context lines).

Do you agree?

Ciao, Dscho

Previous: Junio C HamanoNext: Junio C Hamano
Message 4 of 6 in “What's cooking in git.git (Apr 2009, #02; Sun, 12)”
  1. Junio C HamanoApr 13, 2009
  2. add -e, was Re: What's cooking in git.git (Apr 2009, #02; Sun, 12)Johannes Schindelin, Apr 14, 2009
  3. Junio C HamanoApr 14, 2009
  4. Johannes SchindelinApr 14, 2009
  5. Junio C HamanoApr 14, 2009
  6. Johannes SchindelinApr 16, 2009

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.