From: Martin von Zweigbergk <martin.von.zweigbergk@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, Christian Couder <chriscool@tuxfamily.org>
Subject: Re: [PATCH 2/4] revisions passed to cherry-pick should be in "default" order
Date: Mon, 13 Aug 2012 13:50:35 -0700 [thread overview]
Message-ID: <CAOeW2eEbe9_m_QSbsJUbWPhf6G17X3vqbh__TCefrB0G2VKXdw@mail.gmail.com> (raw)
In-Reply-To: <7vtxw6d0ct.fsf@alter.siamese.dyndns.org>
On Mon, Aug 13, 2012 at 1:05 PM, Junio C Hamano <gitster@pobox.com> wrote:
> y@google.com writes:
>
>> From: Martin von Zweigbergk <martin.von.zweigbergk@gmail.com>
>>
>> 'git cherry-pick' internally sets the --reverse option while walking
>> revisions, so that 'git cherry-pick branch@{u}..branch' will apply the
>> revisions starting at the oldest one. If no uninteresing revisions are
>> given, --no-walk is implied. Still, the documentation for 'git
>> cherry-pick --stdin' uses the following example:
>>
>> git rev-list --reverse master -- README | git cherry-pick -n --stdin
>>
>> The above would seem to reverse the revisions in the output (which it
>> does), and then pipe them to 'git cherry-pick', which would reverse
>> them again and apply them in the wrong order.
>
> I think we have cleared this confusion up in the previous
> discussion. It it sequencer's bug that reorders the commits when
> the caller ("rev-list --reverse" in this case) gives list of
> individual commits to replay.
>
> So I think we are all OK with chucking this patch. Am I mistaken?
I can't really say. I suppose the current patch is smaller (it can't
really get smaller than one line), but iterating over the arguments
the sequencer level might be more correct. Would the result be
different in some cases? I would be happy to add a test case at least,
although I'm not sure when I would have time to implement it in
sequencer.
To connect to the other mail I sent on this thread (in parallel with
yours), do you think "git cherrry-pick HEAD HEAD~1" should apply the
commits in the same order as "git cherry-pick HEAD~2..HEAD" (which
would give the same result if passed to 'rev-list --no-walk' for a
linear history) or in the order specified on the command line? I
couldn't find any conclusive evidence of what was intended in either
log messages or test cases.
next prev parent reply other threads:[~2012-08-13 20:50 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-08-10 20:41 cherry-pick and 'log --no-walk' and ordering Martin von Zweigbergk
2012-08-10 21:38 ` Junio C Hamano
2012-08-11 5:34 ` Martin von Zweigbergk
2012-08-11 6:28 ` Junio C Hamano
2012-08-13 6:27 ` [PATCH 0/4] " y
2012-08-13 7:17 ` Junio C Hamano
2012-08-13 7:26 ` Junio C Hamano
2012-08-13 16:09 ` Martin von Zweigbergk
2012-08-13 17:05 ` Junio C Hamano
2012-08-13 18:28 ` Martin von Zweigbergk
2012-08-13 21:31 ` Junio C Hamano
2012-08-13 22:01 ` Martin von Zweigbergk
2012-08-29 6:15 ` [PATCH v2 0/3] revision (no-)walking in order Martin von Zweigbergk
2012-08-29 6:15 ` [PATCH v2 1/3] teach log --no-walk=unsorted, which avoids sorting Martin von Zweigbergk
2012-08-29 17:34 ` Dan Johnson
2012-08-29 17:42 ` Junio C Hamano
2012-08-29 6:15 ` [PATCH v2 2/3] demonstrate broken 'git cherry-pick three one two' Martin von Zweigbergk
2012-08-30 21:02 ` Junio C Hamano
2012-08-29 6:15 ` [PATCH v2 3/3] cherry-pick/revert: respect order of revisions to pick Martin von Zweigbergk
2012-08-29 6:46 ` [PATCH v2 0/3] revision (no-)walking in order Junio C Hamano
2012-08-29 16:20 ` [PATCH] Martin von Zweigbergk has a new e-mail address Martin von Zweigbergk
[not found] ` <1344839240-17402-1-git-send-email-y>
2012-08-13 6:27 ` [PATCH 1/4] teach log --no-walk=unsorted, which avoids sorting y
2012-08-13 6:27 ` [PATCH 2/4] revisions passed to cherry-pick should be in "default" order y
2012-08-13 20:05 ` Junio C Hamano
2012-08-13 20:50 ` Martin von Zweigbergk [this message]
2012-08-13 21:05 ` Junio C Hamano
2012-08-15 6:05 ` Martin von Zweigbergk
2012-08-15 17:16 ` Junio C Hamano
2012-08-15 18:22 ` Martin von Zweigbergk
2012-08-15 18:39 ` Junio C Hamano
2012-08-15 20:50 ` Martin von Zweigbergk
2012-08-13 20:10 ` Martin von Zweigbergk
2012-08-13 20:52 ` Junio C Hamano
2012-08-13 6:27 ` [PATCH 3/4] cherry-pick/revert: respect order of revisions to pick y
2012-08-13 6:27 ` [PATCH 4/4] cherry-pick/revert: default to topological sorting y
2012-08-13 20:23 ` Junio C Hamano
2012-08-13 21:50 ` Junio C Hamano
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=CAOeW2eEbe9_m_QSbsJUbWPhf6G17X3vqbh__TCefrB0G2VKXdw@mail.gmail.com \
--to=martin.von.zweigbergk@gmail.com \
--cc=chriscool@tuxfamily.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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).