* Trivial patch to git-svn
@ 2007-11-13 21:56 David Reiss
2007-11-17 21:12 ` Eric Wong
0 siblings, 1 reply; 4+ messages in thread
From: David Reiss @ 2007-11-13 21:56 UTC (permalink / raw)
To: git
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;
--
1.5.3.4
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: Trivial patch to git-svn
2007-11-13 21:56 Trivial patch to git-svn David Reiss
@ 2007-11-17 21:12 ` Eric Wong
2007-11-17 21:26 ` Adam Roben
0 siblings, 1 reply; 4+ messages in thread
From: Eric Wong @ 2007-11-17 21:12 UTC (permalink / raw)
To: David Reiss; +Cc: git
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?
--
Eric Wong
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: Trivial patch to git-svn
2007-11-17 21:12 ` Eric Wong
@ 2007-11-17 21:26 ` Adam Roben
2007-11-17 21:54 ` Eric Wong
0 siblings, 1 reply; 4+ messages in thread
From: Adam Roben @ 2007-11-17 21:26 UTC (permalink / raw)
To: Eric Wong; +Cc: David Reiss, git
Eric Wong wrote:
> 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
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: Trivial patch to git-svn
2007-11-17 21:26 ` Adam Roben
@ 2007-11-17 21:54 ` Eric Wong
0 siblings, 0 replies; 4+ messages in thread
From: Eric Wong @ 2007-11-17 21:54 UTC (permalink / raw)
To: Adam Roben; +Cc: David Reiss, git
Adam Roben <aroben@apple.com> wrote:
> Eric Wong wrote:
> >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. :-)
Good eyes, thanks Adam.
Acked-by: Eric Wong <normalperson@yhbt.net>
Pushed out to http://git.bogomips.org/git-svn.git
Along with several other changes
(http://article.gmane.org/gmane.comp.version-control.git/65314)
--
Eric Wong
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2007-11-17 21:54 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-11-13 21:56 Trivial patch to git-svn David Reiss
2007-11-17 21:12 ` Eric Wong
2007-11-17 21:26 ` Adam Roben
2007-11-17 21:54 ` Eric Wong
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).