Re: [PATCH 2/2] rebase --recreate-merges --keep-empty: don't prune empty commits
- From
Johannes Schindelin <johannes.schindelin@gmx.de>
- Date
- Mar 20, 2018, 15:38 UTC
- Message-ID
- <nycvar.QRO.7.76.6.1803201638010.55@ZVAVAG-6OXH6DA.rhebcr.pbec.zvpebfbsg.pbz>
- In-Reply-To
- <20180320101114.17663-3-phillip.wood@talktalk.net>
Hi Phillip,
On Tue, 20 Mar 2018, Phillip Wood wrote:
Show 6 quoted lines
> From: Phillip Wood <phillip.wood@dunelm.org.uk> > > If there are empty commits on the left hand side of $upstream...HEAD > then the empty commits on the right hand side that we want to keep are > pruned because they are marked as cherry-picks. Fix this by keeping > the commits that are empty or are not marked as cherry-picks.
Thank you!
Show 15 quoted lines
> @@ -3172,12 +3173,9 @@ int sequencer_make_script(FILE *out, int argc, const char **argv,
>
> init_revisions(&revs, NULL);
> revs.verbose_header = 1;
> - if (recreate_merges)
> - revs.cherry_mark = 1;
> - else {
> + if (!recreate_merges)
> revs.max_parents = 1;
> - revs.cherry_pick = 1;
> - }
> + revs.cherry_mark = 1;
> revs.limited = 1;
> revs.reverse = 1;
> revs.right_only = 1;Yeah, this looks ugly. I'd rather have your patch series applied first and then rebase my --recreate-merges patch series on top.
Ciao, Dscho