Re: [PATCH 5/4] rebase -i: suggest using --edit-todo to fix an unknown instruction
Johannes Sixt <j.sixt@viscovery.net> writes:
Show 29 quoted lines
> From: Johannes Sixt <j6t@kdbg.org>
>
> We have now an explicit UI to edit the todo sheet and need not disclose
> the name of the file.
>
> Signed-off-by: Johannes Sixt <j6t@kdbg.org>
> ---
> git-rebase--interactive.sh | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
> index 2b8f2a9..4b2ef11 100644
> --- a/git-rebase--interactive.sh
> +++ b/git-rebase--interactive.sh
> @@ -575,11 +575,12 @@ do_next () {
> ;;
> *)
> warn "Unknown command: $command $sha1 $rest"
> + fixtodo="Please fix this using 'git rebase --edit-todo'."
> if git rev-parse --verify -q "$sha1" >/dev/null
> then
> - die_with_patch $sha1 "Please fix this in the file $todo."
> + die_with_patch $sha1 "$fixtodo"
> else
> - die "Please fix this in the file $todo."
> + die "$fixtodo"
> fi
> ;;
> esacGood thinking. Makes sense to me.