Skip to contentSkip to conversation

Trivial patch to git-svn

PATCH David Reiss 3 participants 4 messages Jun 15, 2016

lore
Share & tools
lore
#0 lore raw

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

---
 git-svn.perl |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
git-svn.perl +1 -1
index e3e00fd..981cdd6 100755
@@ -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;
Signature · 1 line
1.5.3.4
#1 lore raw
Quoted 22 lines · David Reiss

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

---
 git-svn.perl |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
git-svn.perl +0 -1
index e3e00fd..981cdd6 100755
@@ -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'

git-svn.perl +1 -0
+		'Cannot dcommit with a dirty index.  Commit your changes 

first, '

git-svn.perl sub cmd_set_tree { · line 397

Quoted 3 lines
git-svn.perl +0 -0
 		. "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?

Signature · 1 line
Eric Wong
#2 lore raw
Quoted 23 lines · Eric Wong
Quoted 21 lines · David Reiss

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

---
 git-svn.perl |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
git-svn.perl +0 -1
index e3e00fd..981cdd6 100755
@@ -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'

git-svn.perl +1 -0
+		'Cannot dcommit with a dirty index.  Commit your changes 
Quoted 9 lines

git-svn.perl sub cmd_set_tree { · line 397

Quoted 5 lines

first, '

git-svn.perl +0 -0
 		. "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

Acked-by
#3 lore raw
Quoted 35 lines · Adam Roben
Quoted 24 lines · Eric Wong
Quoted 22 lines · David Reiss

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

---
git-svn.perl | 2 +-

1 files changed, 1 insertions(+), 1 deletions(-)
git-svn.perl +0 -1
index e3e00fd..981cdd6 100755
@@ -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'

git-svn.perl +1 -0
+		'Cannot dcommit with a dirty index.  Commit your changes 
Quoted 9 lines
Quoted 5 lines

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?

Quoted 2 lines

I don't think the comma matters very much, but having a space between "first" and "or" is pretty important. :-)

Good eyes, thanks Adam.

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)

Signature · 1 line
Eric Wong