git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Johannes Sixt <J.Sixt@eudaptics.com>
To: git@vger.kernel.org
Cc: "Shawn O. Pearce" <spearce@spearce.org>
Subject: Re: [PATCH] Teach git-gui to split hunks
Date: Thu, 26 Jul 2007 09:32:22 +0200	[thread overview]
Message-ID: <46A84E06.2ED4CFBC@eudaptics.com> (raw)
In-Reply-To: Pine.LNX.4.64.0707260630570.14781@racer.site

Johannes Schindelin wrote:
> 
> When you select the context menu item "Split Hunk" in the diff area,
> git-gui will now split the current hunk so that a new hunk starts at
> the current position.
> 
> For this to work, apply has to be called with --unidiff-zero, since
> the new hunks can start or stop with a "-" or "+" line.

For chrissake, NO!

I tried this already, and it immediately corrupted my data.

The problem case is when the hunk you want to apply is not the first one
and the first one does not add and remove the same number of lines. In
this case, all that git-apply can do is to rely on line numbers. But
they are WRONG and apply the patch at the WRONG spot.

First, I didn't believe Linus when he preached that --unidiff-zero is
bad; it took only a day to become a follower. ;)

-- Hannes

  parent reply	other threads:[~2007-07-26  7:32 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-07-26  5:32 [PATCH] Teach git-gui to split hunks Johannes Schindelin
2007-07-26  5:48 ` David Kastrup
2007-07-26  7:07   ` Shawn O. Pearce
2007-07-26 14:34     ` Johannes Schindelin
2007-07-26  7:32 ` Johannes Sixt [this message]
2007-07-26 14:26   ` Johannes Schindelin
  -- strict thread matches above, loose matches on Subject: below --
2007-12-11 13:48 [ANNOUNCE] ugit: a pyqt-based git gui // was: Re: If you would write git from scratch now, what would you change? David
2007-12-11 19:14 ` Jason Sewall
2007-12-11 19:33   ` Marco Costalba
2007-12-11 20:54     ` David
2007-12-11 21:29       ` Jason Sewall
2007-12-12  4:10         ` Shawn O. Pearce
2007-12-12  5:13           ` Jason Sewall
2007-12-12  5:23             ` Shawn O. Pearce
2007-12-12 15:02               ` Jason Sewall
2007-12-12 18:15                 ` Johannes Schindelin
2007-12-12 18:50                   ` Jason Sewall
2007-12-12 19:37                     ` [PATCH] Teach git-gui to split hunks Johannes Schindelin
2007-12-12 20:18                       ` Junio C Hamano
2007-12-12 20:39                         ` Johannes Schindelin
2007-12-12 20:50                         ` Jean-François Veillette
2007-12-12 22:54                           ` Junio C Hamano
2007-12-12 23:02                         ` Wincent Colaiuta
2007-12-13  7:35                       ` Johannes Sixt
2007-12-13  7:48                         ` Shawn O. Pearce
2007-12-13 12:25                         ` Johannes Schindelin
2007-12-13  8:45                       ` Junio C Hamano
2007-12-13  9:41                         ` Johannes Sixt
2007-12-13 12:49                         ` Johannes Schindelin
2007-12-13 14:03                           ` Johannes Sixt
2007-12-13 14:18                             ` 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=46A84E06.2ED4CFBC@eudaptics.com \
    --to=j.sixt@eudaptics.com \
    --cc=git@vger.kernel.org \
    --cc=spearce@spearce.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).