# [PATCH] git-rebase.sh: fix typo 3 messages from 2012-08-01 to 2012-08-02. Participants: Ralf Thielow, Jiang Xin. Thread: https://gitlist.dev/t/31162 ## Ralf Thielow, 2012-08-01 17:09 Subject: [PATCH] git-rebase.sh: fix typo Message-ID: <1343840949-3122-1-git-send-email-ralf.thielow@gmail.com> URL: https://gitlist.dev/e/1343840949-3122-1-git-send-email-ralf.thielow%40gmail.com ``` Fix a typo in the error messages which is shown if it seems that a rebase is already in progress. Signed-off-by: Ralf Thielow --- git-rebase.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git-rebase.sh b/git-rebase.sh index 0e6fd09..15da926 100755 --- a/git-rebase.sh +++ b/git-rebase.sh @@ -348,7 +348,7 @@ then cmd_clear_stale_rebase="rm -fr \"$state_dir\"" die " $(eval_gettext 'It seems that there is already a $state_dir_base directory, and -I wonder if you ware in the middle of another rebase. If that is the +I wonder if you are in the middle of another rebase. If that is the case, please try $cmd_live_rebase If that is not the case, please -- 1.7.12.rc1 ``` ## Jiang Xin, 2012-08-01 23:28 Subject: Re: [PATCH] git-rebase.sh: fix typo Message-ID: URL: https://gitlist.dev/e/CANYiYbGz9Zcyc9_k%3D%2B54nVe8bOj8aheDCZJJ5v9dFTXeAvWk4w%40mail.gmail.com In-Reply-To: <1343840949-3122-1-git-send-email-ralf.thielow@gmail.com> ``` 2012/8/2 Ralf Thielow : > $(eval_gettext 'It seems that there is already a $state_dir_base directory, and > -I wonder if you ware in the middle of another rebase. If that is the > +I wonder if you are in the middle of another rebase. If that is the It's my fault in commit c7108b. I am curious how this happened, and find out that it comes from my copy/paste from code review this post: http://thread.gmane.org/gmane.comp.version-control.git/202010/focus=202048 If I did a more careful diff, especially word-diff, might find it earlier. $ git show --word-diff c7108b | head -122 | tail -1 I wonder if you [-are-]{+ware+} in the middle of another rebase. If that is the -- Jiang Xin ``` ## Ralf Thielow, 2012-08-02 17:41 Subject: Re: [PATCH] git-rebase.sh: fix typo Message-ID: URL: https://gitlist.dev/e/CAN0XMOLHZ1Cfct%2B7%3DmGk6bm1yJcHBQvEKWDQVz8vw9T6vaQDPg%40mail.gmail.com In-Reply-To: <1343840949-3122-1-git-send-email-ralf.thielow@gmail.com> ``` On Wed, Aug 1, 2012 at 7:09 PM, Ralf Thielow wrote: > $(eval_gettext 'It seems that there is already a $state_dir_base directory, and > -I wonder if you ware in the middle of another rebase. If that is the > +I wonder if you are in the middle of another rebase. If that is the > case, please try After looked at it again, I've noticed that there are also two whitespace characters after the sentence (same on another sentence in this message). I don't think that we need another patch for that, though, but it should be fixed when the message gets changed. ```