{"thread":{"id":"31162","subject":"[PATCH] git-rebase.sh: fix typo","startedAt":"2012-08-01T17:09:09Z","lastAt":"2012-08-02T17:41:32Z","messageCount":3,"participants":["Ralf Thielow","Jiang Xin"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"196291","messageId":"1343840949-3122-1-git-send-email-ralf.thielow@gmail.com","threadId":"31162","inReplyTo":null,"subject":"[PATCH] git-rebase.sh: fix typo","fromName":"Ralf Thielow","fromEmail":"ralf.thielow@gmail.com","sentAt":"2012-08-01T17:09:09Z","receivedAt":"2012-08-01T17:09:09Z","isPatch":true,"sender":{"key":"ralf.thielow@gmail.com","avatar":"https://avatars.githubusercontent.com/u/1275832?v=4"},"body":"Fix a typo in the error messages which is\nshown if it seems that a rebase is already\nin progress.\n\nSigned-off-by: Ralf Thielow <ralf.thielow@gmail.com>\n---\n git-rebase.sh | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/git-rebase.sh b/git-rebase.sh\nindex 0e6fd09..15da926 100755\n--- a/git-rebase.sh\n+++ b/git-rebase.sh\n@@ -348,7 +348,7 @@ then\n \tcmd_clear_stale_rebase=\"rm -fr \\\"$state_dir\\\"\"\n \tdie \"\n $(eval_gettext 'It seems that there is already a $state_dir_base directory, and\n-I wonder if you ware in the middle of another rebase.  If that is the\n+I wonder if you are in the middle of another rebase.  If that is the\n case, please try\n \t$cmd_live_rebase\n If that is not the case, please\n-- \n1.7.12.rc1\n"},{"id":"196320","messageId":"CANYiYbGz9Zcyc9_k=+54nVe8bOj8aheDCZJJ5v9dFTXeAvWk4w@mail.gmail.com","threadId":"31162","inReplyTo":"1343840949-3122-1-git-send-email-ralf.thielow@gmail.com","subject":"Re: [PATCH] git-rebase.sh: fix typo","fromName":"Jiang Xin","fromEmail":"worldhello.net@gmail.com","sentAt":"2012-08-01T23:28:46Z","receivedAt":"2012-08-01T23:28:46Z","isPatch":true,"sender":{"key":"worldhello.net@gmail.com","avatar":"https://avatars.githubusercontent.com/u/183860?v=4"},"body":"2012/8/2 Ralf Thielow <ralf.thielow@gmail.com>:\n>  $(eval_gettext 'It seems that there is already a $state_dir_base directory, and\n> -I wonder if you ware in the middle of another rebase.  If that is the\n> +I wonder if you are in the middle of another rebase.  If that is the\n\nIt's my fault in commit c7108b. I am curious how this happened, and find out\nthat it comes from my copy/paste from code review this post:\nhttp://thread.gmane.org/gmane.comp.version-control.git/202010/focus=202048\n\nIf I did a more careful diff, especially word-diff, might find it earlier.\n\n     $ git show --word-diff c7108b | head -122 | tail -1\n     I wonder if you [-are-]{+ware+} in the middle of another rebase.\nIf that is the\n\n-- \nJiang Xin\n"},{"id":"196364","messageId":"CAN0XMOLHZ1Cfct+7=mGk6bm1yJcHBQvEKWDQVz8vw9T6vaQDPg@mail.gmail.com","threadId":"31162","inReplyTo":"1343840949-3122-1-git-send-email-ralf.thielow@gmail.com","subject":"Re: [PATCH] git-rebase.sh: fix typo","fromName":"Ralf Thielow","fromEmail":"ralf.thielow@gmail.com","sentAt":"2012-08-02T17:41:32Z","receivedAt":"2012-08-02T17:41:32Z","isPatch":true,"sender":{"key":"ralf.thielow@gmail.com","avatar":"https://avatars.githubusercontent.com/u/1275832?v=4"},"body":"On Wed, Aug 1, 2012 at 7:09 PM, Ralf Thielow <ralf.thielow@gmail.com> wrote:\n>  $(eval_gettext 'It seems that there is already a $state_dir_base directory, and\n> -I wonder if you ware in the middle of another rebase.  If that is the\n> +I wonder if you are in the middle of another rebase.  If that is the\n>  case, please try\n\nAfter looked at it again, I've noticed that there are also two whitespace\ncharacters after the sentence (same on another sentence in this message).\nI don't think that we need another patch for that, though, but it should be\nfixed when the message gets changed.\n"}]}