From: Junio C Hamano <gitster@pobox.com>
To: Martin von Zweigbergk <martin.von.zweigbergk@gmail.com>
Cc: Git <git@vger.kernel.org>, Christian Couder <chriscool@tuxfamily.org>
Subject: Re: cherry-pick and 'log --no-walk' and ordering
Date: Fri, 10 Aug 2012 14:38:32 -0700 [thread overview]
Message-ID: <7vfw7uig13.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <CAOeW2eE=VcUs1YcWqqEUc6vM6jW9JaXzE-_tVWy48VtPzm_+wA@mail.gmail.com> (Martin von Zweigbergk's message of "Fri, 10 Aug 2012 13:41:36 -0700")
Martin von Zweigbergk <martin.von.zweigbergk@gmail.com> writes:
> There is also cherry-pick/revert, which I _think_ does not really want
> the revisions sorted.
Yes, I think sequencer.c::prepare_revs() is wrong to unconditoinally
call prepare_revision_walk().
It instead should first check the revs->pending.objects list to see
if what was given by the caller is a mere collection of individual
objects or a range expression (i.e. check if any of them is marked
with UNINTERESTING), and refrain from going into the body of the
preparation steps, which has to involve sorting.
I think we had to fix a bug in "git show" coming from a similar root
cause, but the bug manifested in the opposite direction.
next prev parent reply other threads:[~2012-08-10 21:38 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 [this message]
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
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=7vfw7uig13.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=chriscool@tuxfamily.org \
--cc=git@vger.kernel.org \
--cc=martin.von.zweigbergk@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.