From: Johannes Sixt <j6t@kdbg.org>
Date: Wed, 19 Sep 2012 06:43:54 +0000 (+0200)
Subject: rebase -i: suggest using --edit-todo to fix an unknown instruction
X-Git-Tag: v1.8.0-rc0~16^2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9c8e1011b9f6979777946ff87aae7b5846ed20a7;p=git.git

rebase -i: suggest using --edit-todo to fix an unknown instruction

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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index 2b8f2a9f4..4b2ef11e5 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
 		;;
 	esac