rebase -i: improve advice on bad instruction lines
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.thielow@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Ralf Thielow committed
Sep 6, 2016 at 20:59 UTC
37875b4733973ba453abf30e8d48b12751797359
2 files changed
+4
-4
git-rebase--interactive.sh
+1
-1
@@ -1041,7 +1041,7 @@ The possible behaviours are: ignore, warn, error.")"
1041
# placed before the commit of the next action
1042
checkout_onto
1043
1044
- warn "$(gettext "You can fix this with 'git rebase --edit-todo'.")"
1044
+ warn "$(gettext "You can fix this with 'git rebase --edit-todo' and then run 'git rebase --continue'.")"
1045
die "$(gettext "Or you can abort the rebase with 'git rebase --abort'.")"
1046
fi
1047
}
t/t3404-rebase-interactive.sh
+3
-3
@@ -1195,7 +1195,7 @@ To avoid this message, use "drop" to explicitly remove a commit.
1195
Use 'git config rebase.missingCommitsCheck' to change the level of warnings.
1196
The possible behaviours are: ignore, warn, error.
1197
1198
-You can fix this with 'git rebase --edit-todo'.
1198
+You can fix this with 'git rebase --edit-todo' and then run 'git rebase --continue'.
1199
Or you can abort the rebase with 'git rebase --abort'.
1200
EOF
1201
@@ -1219,7 +1219,7 @@ cat >expect <<EOF
1219
Warning: the command isn't recognized in the following line:
1220
- badcmd $(git rev-list --oneline -1 master~1)
1221
1222
-You can fix this with 'git rebase --edit-todo'.
1222
+You can fix this with 'git rebase --edit-todo' and then run 'git rebase --continue'.
1223
Or you can abort the rebase with 'git rebase --abort'.
1224
EOF
1225
@@ -1254,7 +1254,7 @@ cat >expect <<EOF
1254
Warning: the SHA-1 is missing or isn't a commit in the following line:
1255
- edit XXXXXXX False commit
1256
1257
-You can fix this with 'git rebase --edit-todo'.
1257
+You can fix this with 'git rebase --edit-todo' and then run 'git rebase --continue'.
1258
Or you can abort the rebase with 'git rebase --abort'.
1259
EOF
1260