{"thread":{"id":"11497","subject":"[PATCH] rebase interactive: Add hint how to continue after 'Unknown command' error","startedAt":"2008-01-06T15:46:25Z","lastAt":"2008-01-06T20:14:53Z","messageCount":4,"participants":["Steffen Prohaska","Wincent Colaiuta","David Brown","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"64593","messageId":"1199634385511-git-send-email-prohaska@zib.de","threadId":"11497","inReplyTo":null,"subject":"[PATCH] rebase interactive: Add hint how to continue after 'Unknown command' error","fromName":"Steffen Prohaska","fromEmail":"prohaska@zib.de","sentAt":"2008-01-06T15:46:25Z","receivedAt":"2008-01-06T15:46:25Z","isPatch":true,"sender":{"key":"prohaska@zib.de","avatar":"https://avatars.githubusercontent.com/u/217580?v=4"},"body":"rebase interactive asks the user to fix unknown commands but it did not\ntell how to continue.\n\nThis commits adds a hint how to continue.\n\nSigned-off-by: Steffen Prohaska <prohaska@zib.de>\n---\n git-rebase--interactive.sh |    2 +-\n 1 files changed, 1 insertions(+), 1 deletions(-)\n\ndiff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh\nindex acdcc54..d4bd811 100755\n--- a/git-rebase--interactive.sh\n+++ b/git-rebase--interactive.sh\n@@ -310,7 +310,7 @@ do_next () {\n \t\t;;\n \t*)\n \t\twarn \"Unknown command: $command $sha1 $rest\"\n-\t\tdie_with_patch $sha1 \"Please fix this in the file $TODO.\"\n+\t\tdie_with_patch $sha1 \"Please fix this in the file $TODO. And run 'git rebase --continue'.\"\n \t\t;;\n \tesac\n \ttest -s \"$TODO\" && return\n-- \n1.5.4.rc2.26.g1deb\n"},{"id":"64596","messageId":"5F80ADF7-A68A-4DF3-8453-92B76BC927EF@wincent.com","threadId":"11497","inReplyTo":"1199634385511-git-send-email-prohaska@zib.de","subject":"Re: [PATCH] rebase interactive: Add hint how to continue after 'Unknown command' error","fromName":"Wincent Colaiuta","fromEmail":"win@wincent.com","sentAt":"2008-01-06T17:33:32Z","receivedAt":"2008-01-06T17:33:32Z","isPatch":true,"sender":{"key":"greg@hurrell.net","avatar":"https://avatars.githubusercontent.com/u/7074?v=4"},"body":"El 6/1/2008, a las 16:46, Steffen Prohaska escribió:\n\n> @@ -310,7 +310,7 @@ do_next () {\n> \t\t;;\n> \t*)\n> \t\twarn \"Unknown command: $command $sha1 $rest\"\n> -\t\tdie_with_patch $sha1 \"Please fix this in the file $TODO.\"\n> +\t\tdie_with_patch $sha1 \"Please fix this in the file $TODO. And run  \n> 'git rebase --continue'.\"\n\nGrammar nit: sentences can't start with \"And\", so that should really be:\n\n\"Please fix this in the file $TODO and run 'git rebase --continue'.\"\n\nCheers,\nWincent\n"},{"id":"64601","messageId":"20080106195044.GA24169@old.davidb.org","threadId":"11497","inReplyTo":"5F80ADF7-A68A-4DF3-8453-92B76BC927EF@wincent.com","subject":"Re: [PATCH] rebase interactive: Add hint how to continue after 'Unknown command' error","fromName":"David Brown","fromEmail":"git@davidb.org","sentAt":"2008-01-06T19:50:44Z","receivedAt":"2008-01-06T19:50:44Z","isPatch":true,"sender":{"key":"git@davidb.org","avatar":"https://gravatar.com/avatar/94c86a2938470a74c2eac5e2b69afc0871f79a660295c02219597aba8cb101c1?d=mp&s=160"},"body":"On Sun, Jan 06, 2008 at 06:33:32PM +0100, Wincent Colaiuta wrote:\n>El 6/1/2008, a las 16:46, Steffen Prohaska escribió:\n>\n>> @@ -310,7 +310,7 @@ do_next () {\n>> \t\t;;\n>> \t*)\n>> \t\twarn \"Unknown command: $command $sha1 $rest\"\n>> -\t\tdie_with_patch $sha1 \"Please fix this in the file $TODO.\"\n>> +\t\tdie_with_patch $sha1 \"Please fix this in the file $TODO. And run  \n>> 'git rebase --continue'.\"\n>\n>Grammar nit: sentences can't start with \"And\", so that should really be:\n\nNot true:\n<http://www.accu-assist.com/grammar-tips-archive/11-07-06_GrammarTip_and-but-conjunctions.htm>\n\nAlthough, in this case, I would agree that it should just be one sentence\nwith a comma.  It's more of a stylistic construct, more common in fiction\nthan technical documentation.\n\nDave\n"},{"id":"64602","messageId":"7vtzlq4soy.fsf@gitster.siamese.dyndns.org","threadId":"11497","inReplyTo":"20080106195044.GA24169@old.davidb.org","subject":"Re: [PATCH] rebase interactive: Add hint how to continue after 'Unknown command' error","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2008-01-06T20:14:53Z","receivedAt":"2008-01-06T20:14:53Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"David Brown <git@davidb.org> writes:\n\n> On Sun, Jan 06, 2008 at 06:33:32PM +0100, Wincent Colaiuta wrote:\n>>El 6/1/2008, a las 16:46, Steffen Prohaska escribió:\n>>\n>>> @@ -310,7 +310,7 @@ do_next () {\n>>> \t\t;;\n>>> \t*)\n>>> \t\twarn \"Unknown command: $command $sha1 $rest\"\n>>> -\t\tdie_with_patch $sha1 \"Please fix this in the file $TODO.\"\n>>> +\t\tdie_with_patch $sha1 \"Please fix this in the file\n>>> $TODO. And run  'git rebase --continue'.\"\n>>\n>>Grammar nit: sentences can't start with \"And\", so that should really be:\n>\n> Not true:\n> <http://www.accu-assist.com/grammar-tips-archive/11-07-06_GrammarTip_and-but-conjunctions.htm>\n>\n> Although, in this case, I would agree that it should just be one sentence\n> with a comma.  It's more of a stylistic construct, more common in fiction\n> than technical documentation.\n\nI've always wondered why this part can't just re-launch the\neditor with the $TODO file, have the instruction to \"fix\" in the\nfile for the user to see (together with the original \"#\ncommented out\" instructions), and do the --continue itself.\n"}]}