Re: [PATCH] doc: don't claim that cherry-pick calls patch-id
On Tue, Sep 24, 2013 at 03:53:56PM -0700, Jonathan Nieder wrote: > Michael S. Tsirkin wrote: > > > See v2 that I sent, maybe that's clear enough. > > Yep, looks sensible. Thanks. OK, ack that please :) -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH] doc: don't claim that cherry-pick calls patch-id
Michael S. Tsirkin wrote: > See v2 that I sent, maybe that's clear enough. Yep, looks sensible. Thanks. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH] doc: don't claim that cherry-pick calls patch-id
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. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH] doc: don't claim that cherry-pick calls patch-id
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. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH] doc: don't claim that cherry-pick calls patch-id
On Tue, Sep 24, 2013 at 03:14:09PM -0700, Jonathan Nieder wrote: > Michael S. Tsirkin wrote: > > > Subject: [PATCH] doc: don't claim that cherry-pick calls patch-id > > s/cherry-pick/cherry/ > > > The id is already different for binary files. > > Let's document that they are similar, not identical. > > Thanks. > > [...] > > --- a/Documentation/git-cherry.txt > > +++ b/Documentation/git-cherry.txt > > @@ -13,12 +13,13 @@ SYNOPSIS > > DESCRIPTION > > --- > > The changeset (or "diff") of each commit between the fork-point and > > -is compared against each commit between the fork-point and . > > +is compared against diff of each commit between the fork-point and > > . > > I think the old version of this sentence is clearer. > > > -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. > > Every commit that doesn't exist in the branch > > -has its id (sha1) reported, prefixed by a symbol. The ones that have > > +has its diff id (sha1) reported, prefixed by a symbol. The ones that have > > Confusingly, here 'id' means 'commit name'. For example: > > $ git log --oneline -1 sb/repack-in-c > 0b63c6a repack: improve warnings about failure of renaming and removing files > $ git cherry sb/repack-in-c^ sb/repack-in-c > + 0b63c6a5b78f3fdd8c4e4fed4e535e7f4eed4257 > > Hope that helps, > Jonathan -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH] doc: don't claim that cherry-pick calls patch-id
Michael S. Tsirkin wrote: > Subject: [PATCH] doc: don't claim that cherry-pick calls patch-id s/cherry-pick/cherry/ > The id is already different for binary files. > Let's document that they are similar, not identical. Thanks. [...] > --- a/Documentation/git-cherry.txt > +++ b/Documentation/git-cherry.txt > @@ -13,12 +13,13 @@ SYNOPSIS > DESCRIPTION > --- > The changeset (or "diff") of each commit between the fork-point and > -is compared against each commit between the fork-point and . > +is compared against diff of each commit between the fork-point and > . I think the old version of this sentence is clearer. > -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? > Every commit that doesn't exist in the branch > -has its id (sha1) reported, prefixed by a symbol. The ones that have > +has its diff id (sha1) reported, prefixed by a symbol. The ones that have Confusingly, here 'id' means 'commit name'. For example: $ git log --oneline -1 sb/repack-in-c 0b63c6a repack: improve warnings about failure of renaming and removing files $ git cherry sb/repack-in-c^ sb/repack-in-c + 0b63c6a5b78f3fdd8c4e4fed4e535e7f4eed4257 Hope that helps, Jonathan -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
