oneway_merge(): only lstat() when told to update worktree

diff --git a/sequencer.c b/sequencer.c
index bf078f274bfe23997fcd1bc8c2a1c958f39ac9fe..bd626806d64b9cd9a814f062d092501315546bdf 100644 (file)
--- a/sequencer.c
+++ b/sequencer.c
@@ -543,7 +543,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))