git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Michael S. Tsirkin" <mst@redhat.com>
To: Jonathan Nieder <jrnieder@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] doc: don't claim that cherry-pick calls patch-id
Date: Wed, 25 Sep 2013 01:52:03 +0300	[thread overview]
Message-ID: <20130924225203.GA2521@redhat.com> (raw)
In-Reply-To: <20130924224431.GU9464@google.com>

On Tue, Sep 24, 2013 at 03:44:31PM -0700, Jonathan Nieder wrote:
> Michael S. Tsirkin wrote:
> > On Tue, Sep 24, 2013 at 03:14:09PM -0700, Jonathan Nieder wrote:
> >> Michael S. Tsirkin wrote:
> 
> >>> -The commits are compared with their 'patch id', obtained from
> >>> -the 'git patch-id' program.
> >>> +The diffs are compared with their diff id (sha1) calculated after removing
> >>> +any whitespace and line numbers (similar but not necessarily identical
> >>> +to 'patch id', obtained from the 'git patch-id' program).
> >>
> >> The hash used internally is just an implementation detail, so maybe this
> >> sentence could just be dropped?
> >
> > I think the fact whitespace is ignored is relevant to users, no?
> > We probably should drop talking about hash here.
> 
> Ah, good point.  So, something like the following, then?
> 
> 	Whitespace and line numbers are ignored when comparing the diffs,
> 	similarly to linkgit:git-patch-id[1].
> 
> Maybe some other wording would make it clearer that we are not using
> "git diff -w" output.

See v2 that I sent, maybe that's clear enough.

  reply	other threads:[~2013-09-24 22:49 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-09-24 22:05 [PATCH] doc: don't claim that cherry-pick calls patch-id Michael S. Tsirkin
2013-09-24 22:14 ` Jonathan Nieder
2013-09-24 22:28   ` Michael S. Tsirkin
2013-09-24 22:44     ` Jonathan Nieder
2013-09-24 22:52       ` Michael S. Tsirkin [this message]
2013-09-24 22:53         ` Jonathan Nieder
2013-09-24 22:58           ` 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=20130924225203.GA2521@redhat.com \
    --to=mst@redhat.com \
    --cc=git@vger.kernel.org \
    --cc=jrnieder@gmail.com \
    /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).