git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Clemens Buchacher <drizzd@aon.at>
Cc: "Shawn O. Pearce" <spearce@spearce.org>, git@vger.kernel.org
Subject: Re: [PATCH] git gui: use apply --unidiff-zero when staging hunks without context
Date: Sat, 30 Aug 2008 10:53:15 -0700	[thread overview]
Message-ID: <7vhc92ie44.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: <20080830165600.GB25370@localhost> (Clemens Buchacher's message of "Sat, 30 Aug 2008 18:56:00 +0200")

Clemens Buchacher <drizzd@aon.at> writes:

> echo a > victim
> git add victim
> echo b >> victim
> git diff -U0 | git apply --cached --unidiff-zero
> git diff

I think "diff -U0" there would say "@@ -1,0 +2 @@", iow "add this one line
after the first line", and "apply" has an off-by-one in this case.

  reply	other threads:[~2008-08-30 17:54 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-08-30 16:45 [PATCH] git gui: show diffs with a minimum of 1 context line Clemens Buchacher
2008-08-30 16:56 ` [PATCH] git gui: use apply --unidiff-zero when staging hunks without context Clemens Buchacher
2008-08-30 17:53   ` Junio C Hamano [this message]
2008-08-30 19:03     ` [PATCH] git apply: do not match beginning in special unidiff-zero case Clemens Buchacher
2008-08-30 19:54       ` Junio C Hamano
2008-08-30 19:40     ` [PATCH] git-apply: Loosen "match_beginning" logic Junio C Hamano
2008-08-30 19:43   ` [PATCH] git gui: use apply --unidiff-zero when staging hunks without context Johannes Sixt
2008-08-30 20:27     ` Clemens Buchacher
2008-08-30 20:52       ` Junio C Hamano
2008-08-30 21:00         ` Clemens Buchacher
2008-09-01 19:40           ` Shawn O. Pearce
2008-08-30 17:19 ` [PATCH] git gui: show diffs with a minimum of 1 context line Junio C Hamano
2008-08-30 17:30   ` Junio C Hamano
2008-08-30 20:46 ` Clemens Buchacher
2008-09-01 19:33 ` Shawn O. Pearce
2008-09-01 19:41   ` Clemens Buchacher
2008-09-01 19:47     ` Shawn O. Pearce

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=7vhc92ie44.fsf@gitster.siamese.dyndns.org \
    --to=gitster@pobox.com \
    --cc=drizzd@aon.at \
    --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).