{"thread":{"id":"14080","subject":"git rebase --continue error message","startedAt":"2008-06-22T03:21:53Z","lastAt":"2008-06-22T14:07:02Z","messageCount":2,"participants":["Lea Wiemann","Stephan Beyer"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"80585","messageId":"485DC551.9020807@gmail.com","threadId":"14080","inReplyTo":null,"subject":"git rebase --continue error message","fromName":"Lea Wiemann","fromEmail":"lewiemann@gmail.com","sentAt":"2008-06-22T03:21:53Z","receivedAt":"2008-06-22T03:21:53Z","isPatch":false,"sender":{"key":"lewiemann@gmail.com","avatar":null},"body":"The error message for git rebase --continue is misleading if no rebase \nis in progress:\n\n$ git rebase --abort\nNo rebase in progress?\n$ git rebase --continue\nYou must edit all merge conflicts and then\nmark them as resolved using git add\n\nAnyone care to fix it?\n"},{"id":"80615","messageId":"1214143622-28897-1-git-send-email-s-beyer@gmx.net","threadId":"14080","inReplyTo":"485DC551.9020807@gmail.com","subject":"[PATCH] git-rebase.sh: Add check if rebase is in progress","fromName":"Stephan Beyer","fromEmail":"s-beyer@gmx.net","sentAt":"2008-06-22T14:07:02Z","receivedAt":"2008-06-22T14:07:02Z","isPatch":true,"sender":{"key":"s-beyer@gmx.net","avatar":"https://avatars.githubusercontent.com/u/143889?v=4"},"body":"Signed-off-by: Stephan Beyer <s-beyer@gmx.net>\n---\n git-rebase.sh |   14 ++++++++++----\n 1 files changed, 10 insertions(+), 4 deletions(-)\n\ndiff --git a/git-rebase.sh b/git-rebase.sh\nindex dd7dfe1..74f9c25 100755\n--- a/git-rebase.sh\n+++ b/git-rebase.sh\n@@ -150,6 +150,9 @@ while test $# != 0\n do\n \tcase \"$1\" in\n \t--continue)\n+\t\ttest -d \"$dotest\" -o -d .dotest ||\n+\t\t\tdie \"No rebase in progress?\"\n+\t\t\n \t\tgit diff-files --quiet --ignore-submodules || {\n \t\t\techo \"You must edit all merge conflicts and then\"\n \t\t\techo \"mark them as resolved using git add\"\n@@ -178,6 +181,9 @@ do\n \t\texit\n \t\t;;\n \t--skip)\n+\t\ttest -d \"$dotest\" -o -d .dotest ||\n+\t\t\tdie \"No rebase in progress?\"\n+\t\t\n \t\tgit reset --hard HEAD || exit $?\n \t\tif test -d \"$dotest\"\n \t\tthen\n@@ -203,16 +209,16 @@ do\n \t\texit\n \t\t;;\n \t--abort)\n+\t\ttest -d \"$dotest\" -o -d .dotest ||\n+\t\t\tdie \"No rebase in progress?\"\n+\t\t\n \t\tgit rerere clear\n \t\tif test -d \"$dotest\"\n \t\tthen\n \t\t\tmove_to_original_branch\n-\t\telif test -d .dotest\n-\t\tthen\n+\t\telse\n \t\t\tdotest=.dotest\n \t\t\tmove_to_original_branch\n-\t\telse\n-\t\t\tdie \"No rebase in progress?\"\n \t\tfi\n \t\tgit reset --hard $(cat \"$dotest/orig-head\")\n \t\trm -r \"$dotest\"\n-- \n1.5.6.310.g344d\n"}]}