diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-03-29 18:08:09 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-03-29 18:08:09 (GMT) |
| commit | 56173d28a5fb811c9525a8d5052ab6d83a07122e (patch) | |
| tree | d3a0dba51a0e6760184c4ffd7e4f2f9bdf23b8f8 /sequencer.c | |
| parent | 0f57f731ea2a540a4c82b476054e8a36aebb2314 (diff) | |
| parent | 3d946165e1177905103a25aeb374e018c510e540 (diff) | |
| download | git-56173d28a5fb811c9525a8d5052ab6d83a07122e.zip git-56173d28a5fb811c9525a8d5052ab6d83a07122e.tar.gz git-56173d28a5fb811c9525a8d5052ab6d83a07122e.tar.bz2 | |
Merge branch 'pw/rebase-keep-empty-fixes' into pw/rebase-signoff
* pw/rebase-keep-empty-fixes:
rebase: respect --no-keep-empty
rebase -i --keep-empty: don't prune empty commits
rebase --root: stop assuming squash_onto is unset
Git 2.16.2
Diffstat (limited to 'sequencer.c')
| -rw-r--r-- | sequencer.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/sequencer.c b/sequencer.c index 5bfdc40..45aa7e3 100644 --- a/sequencer.c +++ b/sequencer.c @@ -2992,7 +2992,7 @@ int sequencer_make_script(FILE *out, int argc, const char **argv, init_revisions(&revs, NULL); revs.verbose_header = 1; revs.max_parents = 1; - revs.cherry_pick = 1; + revs.cherry_mark = 1; revs.limited = 1; revs.reverse = 1; revs.right_only = 1; @@ -3017,8 +3017,12 @@ int sequencer_make_script(FILE *out, int argc, const char **argv, return error(_("make_script: error preparing revisions")); while ((commit = get_revision(&revs))) { + int is_empty = is_original_commit_empty(commit); + + if (!is_empty && (commit->object.flags & PATCHSAME)) + continue; strbuf_reset(&buf); - if (!keep_empty && is_original_commit_empty(commit)) + if (!keep_empty && is_empty) strbuf_addf(&buf, "%c ", comment_line_char); strbuf_addf(&buf, "%s %s ", insn, oid_to_hex(&commit->object.oid)); |