Hi Ralf, There are quite a few patch series in flight these days around interactive rebase. Have you checked for conflicts with those?
On di, 2016-09-06 at 20:59 +0200, Ralf Thielow wrote: > If we found bad instruction lines in the instruction sheet > of interactive rebase, we give the user advice on how to > fix it. However, we don't tell the user what to do afterwards. > Give the user advice to run 'git rebase --continue' after > the fix. > > Signed-off-by: Ralf Thielow <ralf.thie...@gmail.com> > --- > Changes in v2: > - adjust tests > > git-rebase--interactive.sh | 2 +- > t/t3404-rebase-interactive.sh | 6 +++--- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh > index b1ba21c..029594e 100644 > --- a/git-rebase--interactive.sh > +++ b/git-rebase--interactive.sh > @@ -1041,7 +1041,7 @@ The possible behaviours are: ignore, warn, > error.")" > # placed before the commit of the next action > checkout_onto > > - warn "$(gettext "You can fix this with 'git rebase > --edit-todo'.")" > + warn "$(gettext "You can fix this with 'git rebase > --edit-todo' and then run 'git rebase --continue'.")" > die "$(gettext "Or you can abort the rebase with > 'git rebase --abort'.")" > fi > } > diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase- > interactive.sh > index 597e94e..e38e296 100755 > --- a/t/t3404-rebase-interactive.sh > +++ b/t/t3404-rebase-interactive.sh > @@ -1195,7 +1195,7 @@ To avoid this message, use "drop" to explicitly > remove a commit. > Use 'git config rebase.missingCommitsCheck' to change the level of > warnings. > The possible behaviours are: ignore, warn, error. > > -You can fix this with 'git rebase --edit-todo'. > +You can fix this with 'git rebase --edit-todo' and then run 'git > rebase --continue'. > Or you can abort the rebase with 'git rebase --abort'. > EOF > > @@ -1219,7 +1219,7 @@ cat >expect <<EOF > Warning: the command isn't recognized in the following line: > - badcmd $(git rev-list --oneline -1 master~1) > > -You can fix this with 'git rebase --edit-todo'. > +You can fix this with 'git rebase --edit-todo' and then run 'git > rebase --continue'. > Or you can abort the rebase with 'git rebase --abort'. > EOF > > @@ -1254,7 +1254,7 @@ cat >expect <<EOF > Warning: the SHA-1 is missing or isn't a commit in the following > line: > - edit XXXXXXX False commit > > -You can fix this with 'git rebase --edit-todo'. > +You can fix this with 'git rebase --edit-todo' and then run 'git > rebase --continue'. > Or you can abort the rebase with 'git rebase --abort'. > EOF >
