Re: [PATCH 2/2] rebase --exec: make it work with --rebase-merges

2018-08-06 Thread Junio C Hamano
Johannes Schindelin writes: >> If we ever see a todo-list without any pick/merge, then insert_final >> is still 1 when we leave the loop and we will add one single exec at >> the end. Which may or may not make sense---I dunno, as I do not >> offhand think of a reason why the user would give us

Re: [PATCH 2/2] rebase --exec: make it work with --rebase-merges

2018-08-06 Thread Johannes Schindelin
Hi Junio, On Fri, 3 Aug 2018, Junio C Hamano wrote: > "Johannes Schindelin via GitGitGadget" > writes: > > > diff --git a/sequencer.c b/sequencer.c > > index 31038472f..dda5cdbba 100644 > > --- a/sequencer.c > > +++ b/sequencer.c > > @@ -4244,10 +4244,9 @@ int sequencer_add_exec_commands(const

Re: [PATCH 2/2] rebase --exec: make it work with --rebase-merges

2018-08-06 Thread Johannes Schindelin
Hi Junio, On Fri, 3 Aug 2018, Junio C Hamano wrote: > "Johannes Schindelin via GitGitGadget" > writes: > > > + /* > > +* Insert after every pick. Here, fixup/squash chains > > +* are considered part of the pick, so we insert the commands *after* > > +* those chains if there are

Re: [PATCH 2/2] rebase --exec: make it work with --rebase-merges

2018-08-06 Thread Johannes Schindelin
Hi Junio, On Fri, 3 Aug 2018, Junio C Hamano wrote: > "Johannes Schindelin via GitGitGadget" > writes: > > > From: Johannes Schindelin > > > > The idea of `--exec` is to append an `exec` call after each `pick`. > > > > Since the introduction of fixup!/squash! commits, this idea was extended >

Re: [PATCH 2/2] rebase --exec: make it work with --rebase-merges

2018-08-03 Thread Junio C Hamano
"Johannes Schindelin via GitGitGadget" writes: > + /* > + * Insert after every pick. Here, fixup/squash chains > + * are considered part of the pick, so we insert the commands *after* > + * those chains if there are any. > + */ > + insert_final_commands = 1; > +

Re: [PATCH 2/2] rebase --exec: make it work with --rebase-merges

2018-08-03 Thread Junio C Hamano
"Johannes Schindelin via GitGitGadget" writes: > From: Johannes Schindelin > > The idea of `--exec` is to append an `exec` call after each `pick`. > > Since the introduction of fixup!/squash! commits, this idea was extended > to apply to "pick, possibly followed by a fixup/squash chain", i.e.

[PATCH 2/2] rebase --exec: make it work with --rebase-merges

2018-08-03 Thread Johannes Schindelin via GitGitGadget
From: Johannes Schindelin The idea of `--exec` is to append an `exec` call after each `pick`. Since the introduction of fixup!/squash! commits, this idea was extended to apply to "pick, possibly followed by a fixup/squash chain", i.e. an exec would not be inserted between a `pick` and any of