{"thread":{"id":"21612","subject":"[PATCH] rebase -i: Simplify handling of invalid commands.","startedAt":"2009-11-14T08:11:15Z","lastAt":"2009-11-14T08:11:15Z","messageCount":1,"participants":["Greg Price"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"127535","messageId":"20091114081115.GM30538@dr-wily.mit.edu","threadId":"21612","inReplyTo":null,"subject":"[PATCH] rebase -i: Simplify handling of invalid commands.","fromName":"Greg Price","fromEmail":"price@mit.edu","sentAt":"2009-11-14T08:11:15Z","receivedAt":"2009-11-14T08:11:15Z","isPatch":true,"sender":{"key":"price@mit.edu","avatar":"https://avatars.githubusercontent.com/u/28173?v=4"},"body":"A few weeks ago there was a bug report that some invalid commands\nproduced confusing error messages.  The fix could have made things\nsimpler.  There's no need for die_with_patch in this case, because its\npurpose is to tell rerere and a future rebase --continue about a\ncommit that we just attempted, and we didn't attempt any commit.  So\njust use a plain \"die\" unconditionally.\n\nSigned-off-by: Greg Price <price@mit.edu>\n---\n git-rebase--interactive.sh |    7 +------\n 1 files changed, 1 insertions(+), 6 deletions(-)\n\ndiff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh\nindex 53ad248..6d0ca7b 100755\n--- a/git-rebase--interactive.sh\n+++ b/git-rebase--interactive.sh\n@@ -416,12 +416,7 @@ do_next () {\n \t\t;;\n \t*)\n \t\twarn \"Unknown command: $command $sha1 $rest\"\n-\t\tif git rev-parse --verify -q \"$sha1\" >/dev/null\n-\t\tthen\n-\t\t\tdie_with_patch $sha1 \"Please fix this in the file $TODO.\"\n-\t\telse\n-\t\t\tdie \"Please fix this in the file $TODO.\"\n-\t\tfi\n+\t\tdie \"Please fix this in the file $TODO.\"\n \t\t;;\n \tesac\n \ttest -s \"$TODO\" && return\n-- \n1.6.5.2.27.g906c6.dirty\n"}]}