[PATCH 0/4] Re: cherry-pick and 'log --no-walk' and ordering

From: y@google.com <y@google.com>
Date: Aug 13, 2012, 06:27 UTC
Message-ID: <50289e50.8458320a.7d31.3c46SMTPIN_ADDED@gmr-mx.google.com>
In-Reply-To: <7vpq6ygcy1.fsf@alter.siamese.dyndns.org>

From: Martin von Zweigbergk <martin.von.zweigbergk@gmail.com>

This series adds supports for 'git log --no-walk=unsorted', which should be useful for the re-roll of my mz/rebase-range series. It also addresses the bug in cherry-pick/revert, which makes it sort revisions by date.

On Fri, Aug 10, 2012 at 11:28 PM, Junio C Hamano <gitster@pobox.com> wrote:

Show 5 quoted lines

> Range limited revision walking, e.g. "git cherry-pick A..B D~4..D",
> fundamentally implies sorting and you cannot assume B would appear
> before D only because B comes before D on the command line (B may
> even be inside D~4..D range in which case it would not even appear
> in the final output).

Sorry, I probably wasn't clear; I mentioned "revision walking", but I only meant the no-walk case. I hope the patches make sense.

Martin von Zweigbergk (4):
  teach log --no-walk=unsorted, which avoids sorting
  revisions passed to cherry-pick should be in "default" order
  cherry-pick/revert: respect order of revisions to pick
  cherry-pick/revert: default to topological sorting

 Documentation/git-cherry-pick.txt   |  2 +-
 builtin/log.c                       |  2 +-
 builtin/revert.c                    |  3 ++-
 revision.c                          | 18 +++++++++++++++---
 revision.h                          |  6 +++++-
 t/t3508-cherry-pick-many-commits.sh |  2 +-
 t/t3510-cherry-pick-sequence.sh     |  4 ++--
 t/t4202-log.sh                      | 10 ++++++++++
 8 files changed, 37 insertions(+), 10 deletions(-)

-- 
1.7.11.1.104.ge7b44f1