Merge branch 'jt/rebase-allow-duplicate'

[thirdparty/git.git] / sequencer.c

diff --git a/sequencer.c b/sequencer.c
index ce28cad60a6554d363a5bccccd1fc3eccbffd812..f30bb73c703a2b872dec85de7c68f6aa6c0b075d 100644 (file)
--- a/sequencer.c
+++ b/sequencer.c
@@ -4852,12 +4852,13 @@ int sequencer_make_script(struct repository *r, struct strbuf *out, int argc,
        int keep_empty = flags & TODO_LIST_KEEP_EMPTY;
        const char *insn = flags & TODO_LIST_ABBREVIATE_CMDS ? "p" : "pick";
        int rebase_merges = flags & TODO_LIST_REBASE_MERGES;
+       int reapply_cherry_picks = flags & TODO_LIST_REAPPLY_CHERRY_PICKS;
 
        repo_init_revisions(r, &revs, NULL);
        revs.verbose_header = 1;
        if (!rebase_merges)
                revs.max_parents = 1;
-       revs.cherry_mark = 1;
+       revs.cherry_mark = !reapply_cherry_picks;
        revs.limited = 1;
        revs.reverse = 1;
        revs.right_only = 1;