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 19:34:55 +0200 [thread overview]
Message-ID: <20140327173455.GB2593@redhat.com> (raw)
In-Reply-To: <xmqqvbuzefy6.fsf@gitster.dls.corp.google.com>
On Thu, Mar 27, 2014 at 09:58:41AM -0700, Junio C Hamano wrote:
> "Michael S. Tsirkin" <mst@redhat.com> writes:
>
> > Patch id changes if you reorder hunks in a diff.
>
> If you reorder hunks, the patch should no longer apply [*1*], so a
> feature to make patch-id stable across such move would have no
> practical use ;-), but I am guessing you meant something else.
>
> Perhaps this is about using "-O <orderfile>" option, even though you
> happened to have implemented the id mixing at per-hunk level?
Yes.
>
> [Footnote]
>
> *1* It has been a long time since I looked at the code, and I do not
> know offhand if "git apply" has such a bug not to diagnose a hunk
> for a file for an earlier part that comes later in its input stream
> after seeing another hunk for the same file as a bug. If it does
> not, perhaps we should.
Hmm you are right.
For some reason I thought that it does work.
I'll drop this part then, less code this way.
Thanks!
Any more comments before I spin v2?
--
MST
next prev parent reply other threads:[~2014-03-27 17:36 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 [this message]
2014-03-27 17:57 ` Michael S. Tsirkin
2014-03-27 18:03 ` Junio C Hamano
2014-03-27 18:39 ` Michael S. Tsirkin
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=20140327173455.GB2593@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).