diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-09-10 22:42:54 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-09-10 22:42:55 (GMT) |
| commit | c2b927932d90588e7094100b470b9e94bd769afe (patch) | |
| tree | ca85ef0330ea4906103141855f79914710b52463 /sequencer.c | |
| parent | 1c0712dea8fd927faa49fe494f507d18f0d41264 (diff) | |
| parent | a73e22e96350c9bcb5c0e31e0298ce67bec0a527 (diff) | |
| download | git-c2b927932d90588e7094100b470b9e94bd769afe.zip git-c2b927932d90588e7094100b470b9e94bd769afe.tar.gz git-c2b927932d90588e7094100b470b9e94bd769afe.tar.bz2 | |
Merge branch 'mz/cherry-pick-cmdline-order'
"git cherry-pick A C B" used to replay changes in A and then B and
then C if these three commits had committer timestamps in that
order, which is not what the user who said "A C B" naturally expects.
* mz/cherry-pick-cmdline-order:
cherry-pick/revert: respect order of revisions to pick
demonstrate broken 'git cherry-pick three one two'
teach log --no-walk=unsorted, which avoids sorting
Diffstat (limited to 'sequencer.c')
| -rw-r--r-- | sequencer.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sequencer.c b/sequencer.c index 1ea5293..f86f116 100644 --- a/sequencer.c +++ b/sequencer.c @@ -546,7 +546,11 @@ static int do_pick_commit(struct commit *commit, struct replay_opts *opts) static void prepare_revs(struct replay_opts *opts) { - if (opts->action != REPLAY_REVERT) + /* + * picking (but not reverting) ranges (but not individual revisions) + * should be done in reverse + */ + if (opts->action == REPLAY_PICK && !opts->revs->no_walk) opts->revs->reverse ^= 1; if (prepare_revision_walk(opts->revs)) |