Re: Trivial patch to git-svn
- From
Adam Roben <aroben@apple.com>
- Date
- Nov 17, 2007, 21:26 UTC
- Message-ID
- <473F5C75.3040707@apple.com>
- In-Reply-To
- <20071117211253.GB31598@mayonaise>
Eric Wong wrote:
Show 32 quoted lines
> David Reiss <dreiss@facebook.com> wrote:
>
>> From d9f93dc1c503c5f42b27485b2c35b38e8c9bca44 Mon Sep 17 00:00:00 2001
>> From: David Reiss <dreiss@dreiss-vmware.(none)>
>> Date: Tue, 13 Nov 2007 13:47:26 -0800
>> Subject: [PATCH] Fix a typo and add a comma in an error message in git-svn
>>
>> Signed-off-by: David Reiss <dreiss@facebook.com>
>> ---
>> git-svn.perl | 2 +-
>> 1 files changed, 1 insertions(+), 1 deletions(-)
>>
>> diff --git a/git-svn.perl b/git-svn.perl
>> index e3e00fd..981cdd6 100755
>> --- a/git-svn.perl
>> +++ b/git-svn.perl
>> @@ -391,7 +391,7 @@ sub cmd_set_tree {
>> sub cmd_dcommit {
>> my $head = shift;
>> git_cmd_try { command_oneline(qw/diff-index --quiet HEAD/) }
>> - 'Cannot dcommit with a dirty index. Commit your changes
>> first'
>> + 'Cannot dcommit with a dirty index. Commit your changes
>> first, '
>> . "or stash them with `git stash'.\n";
>> $head ||= 'HEAD';
>> my @refs;
>>
>
> I am not an English expert, but both seem acceptable to me. Anybody else
> agree/disagree?
> I don't think the comma matters very much, but having a space between "first" and "or" is pretty important. :-)
-Adam