git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Michael S. Tsirkin" <mst@redhat.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, jrnieder@gmail.com, peff@peff.net
Subject: Re: [PATCH 1/3] patch-id: make it stable against hunk reordering
Date: Thu, 27 Mar 2014 20:39:17 +0200	[thread overview]
Message-ID: <20140327183917.GA3980@redhat.com> (raw)
In-Reply-To: <xmqqfvm3ecxp.fsf@gitster.dls.corp.google.com>

On Thu, Mar 27, 2014 at 11:03:46AM -0700, Junio C Hamano wrote:
> "Michael S. Tsirkin" <mst@redhat.com> writes:
> 
> > I started to remove that code, but then I recalled why I did it like
> > this.  There is a good reason.  Yes, you can't simply reorder hunks just
> > like this.  But you can get the same effect by prefixing the header:
> 
> Yes, that is one of the things I personally have on the chopping
> block.  Having to deal with more than occurrences of the same
> pathname in the input made things in builtin/apply.c unnecessarily
> complex and I do not see a real gain for being able to concatenate
> two patches and feed it into a single "git apply" invocation.

Well - I expect that this will surprise some people: gnu
patch accepts this, and it's a natural assumption
that it works. There could be tools producing such diffs, too.

Anyway - we can drop this from patch-id and git apply at
the same time?

-- 
MST

  reply	other threads:[~2014-03-27 18:39 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-03-27  9:25 [PATCH 1/3] patch-id: make it stable against hunk reordering Michael S. Tsirkin
2014-03-27  9:25 ` [PATCH 2/3] patch-id: document new behaviour Michael S. Tsirkin
2014-03-27  9:25 ` [PATCH 3/3] patch-id-test: test new --stable and --unstable flags Michael S. Tsirkin
2014-03-28  0:25   ` Eric Sunshine
2014-03-27 16:58 ` [PATCH 1/3] patch-id: make it stable against hunk reordering Junio C Hamano
2014-03-27 17:34   ` Michael S. Tsirkin
2014-03-27 17:57   ` Michael S. Tsirkin
2014-03-27 18:03     ` Junio C Hamano
2014-03-27 18:39       ` Michael S. Tsirkin [this message]
2014-03-27 18:45         ` Michael S. Tsirkin

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=20140327183917.GA3980@redhat.com \
    --to=mst@redhat.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=jrnieder@gmail.com \
    --cc=peff@peff.net \
    /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).