{"thread":{"id":"10856","subject":"Trivial patch to git-svn","startedAt":"2007-11-13T21:56:47Z","lastAt":"2007-11-17T21:54:32Z","messageCount":4,"participants":["David Reiss","Eric Wong","Adam Roben"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"59757","messageId":"473A1D9F.4030103@facebook.com","threadId":"10856","inReplyTo":null,"subject":"Trivial patch to git-svn","fromName":"David Reiss","fromEmail":"dreiss@facebook.com","sentAt":"2007-11-13T21:56:47Z","receivedAt":"2007-11-13T21:56:47Z","isPatch":false,"sender":{"key":"dreiss@facebook.com","avatar":null},"body":" From d9f93dc1c503c5f42b27485b2c35b38e8c9bca44 Mon Sep 17 00:00:00 2001\nFrom: David Reiss \nDate: Tue, 13 Nov 2007 13:47:26 -0800\nSubject: [PATCH] Fix a typo and add a comma in an error message in git-svn\n\nSigned-off-by: David Reiss \n---\n git-svn.perl | 2 +-\n 1 files changed, 1 insertions(+), 1 deletions(-)\n\ndiff --git a/git-svn.perl b/git-svn.perl\nindex e3e00fd..981cdd6 100755\n--- a/git-svn.perl\n+++ b/git-svn.perl\n@@ -391,7 +391,7 @@ sub cmd_set_tree {\n sub cmd_dcommit {\n \tmy $head = shift;\n \tgit_cmd_try { command_oneline(qw/diff-index --quiet HEAD/) }\n-\t\t'Cannot dcommit with a dirty index. Commit your changes first'\n+\t\t'Cannot dcommit with a dirty index. Commit your changes first, '\n \t\t. \"or stash them with `git stash'.\\n\";\n \t$head ||= 'HEAD';\n \tmy @refs;\n-- \n1.5.3.4\n"},{"id":"60171","messageId":"20071117211253.GB31598@mayonaise","threadId":"10856","inReplyTo":"473A1D9F.4030103@facebook.com","subject":"Re: Trivial patch to git-svn","fromName":"Eric Wong","fromEmail":"normalperson@yhbt.net","sentAt":"2007-11-17T21:12:53Z","receivedAt":"2007-11-17T21:12:53Z","isPatch":false,"sender":{"key":"e@80x24.org","avatar":null},"body":"David Reiss wrote:\n> From d9f93dc1c503c5f42b27485b2c35b38e8c9bca44 Mon Sep 17 00:00:00 2001\n> From: David Reiss \n> Date: Tue, 13 Nov 2007 13:47:26 -0800\n> Subject: [PATCH] Fix a typo and add a comma in an error message in git-svn\n> \n> Signed-off-by: David Reiss \n> ---\n> git-svn.perl | 2 +-\n> 1 files changed, 1 insertions(+), 1 deletions(-)\n> \n> diff --git a/git-svn.perl b/git-svn.perl\n> index e3e00fd..981cdd6 100755\n> --- a/git-svn.perl\n> +++ b/git-svn.perl\n> @@ -391,7 +391,7 @@ sub cmd_set_tree {\n> sub cmd_dcommit {\n> \tmy $head = shift;\n> \tgit_cmd_try { command_oneline(qw/diff-index --quiet HEAD/) }\n> -\t\t'Cannot dcommit with a dirty index. Commit your changes \n> first'\n> +\t\t'Cannot dcommit with a dirty index. Commit your changes \n> first, '\n> \t\t. \"or stash them with `git stash'.\\n\";\n> \t$head ||= 'HEAD';\n> \tmy @refs;\n\nI am not an English expert, but both seem acceptable to me. Anybody else\nagree/disagree?\n\n-- \nEric Wong\n"},{"id":"60175","messageId":"473F5C75.3040707@apple.com","threadId":"10856","inReplyTo":"20071117211253.GB31598@mayonaise","subject":"Re: Trivial patch to git-svn","fromName":"Adam Roben","fromEmail":"aroben@apple.com","sentAt":"2007-11-17T21:26:13Z","receivedAt":"2007-11-17T21:26:13Z","isPatch":false,"sender":{"key":"aroben@apple.com","avatar":"https://gravatar.com/avatar/9d3697e1de53890adf241331f4b970bdd2b18962b2ff0b8028ebb00e085807f8?d=mp&s=160"},"body":"Eric Wong wrote:\n> David Reiss wrote:\n> \n>> From d9f93dc1c503c5f42b27485b2c35b38e8c9bca44 Mon Sep 17 00:00:00 2001\n>> From: David Reiss \n>> Date: Tue, 13 Nov 2007 13:47:26 -0800\n>> Subject: [PATCH] Fix a typo and add a comma in an error message in git-svn\n>>\n>> Signed-off-by: David Reiss \n>> ---\n>> git-svn.perl | 2 +-\n>> 1 files changed, 1 insertions(+), 1 deletions(-)\n>>\n>> diff --git a/git-svn.perl b/git-svn.perl\n>> index e3e00fd..981cdd6 100755\n>> --- a/git-svn.perl\n>> +++ b/git-svn.perl\n>> @@ -391,7 +391,7 @@ sub cmd_set_tree {\n>> sub cmd_dcommit {\n>> \tmy $head = shift;\n>> \tgit_cmd_try { command_oneline(qw/diff-index --quiet HEAD/) }\n>> -\t\t'Cannot dcommit with a dirty index. Commit your changes \n>> first'\n>> +\t\t'Cannot dcommit with a dirty index. Commit your changes \n>> first, '\n>> \t\t. \"or stash them with `git stash'.\\n\";\n>> \t$head ||= 'HEAD';\n>> \tmy @refs;\n>> \n>\n> I am not an English expert, but both seem acceptable to me. Anybody else\n> agree/disagree?\n> \n\nI don't think the comma matters very much, but having a space between \n\"first\" and \"or\" is pretty important. :-)\n\n-Adam\n"},{"id":"60178","messageId":"20071117215432.GB28755@muzzle","threadId":"10856","inReplyTo":"473F5C75.3040707@apple.com","subject":"Re: Trivial patch to git-svn","fromName":"Eric Wong","fromEmail":"normalperson@yhbt.net","sentAt":"2007-11-17T21:54:32Z","receivedAt":"2007-11-17T21:54:32Z","isPatch":false,"sender":{"key":"e@80x24.org","avatar":null},"body":"Adam Roben wrote:\n> Eric Wong wrote:\n> >David Reiss wrote:\n> > \n> >>From d9f93dc1c503c5f42b27485b2c35b38e8c9bca44 Mon Sep 17 00:00:00 2001\n> >>From: David Reiss \n> >>Date: Tue, 13 Nov 2007 13:47:26 -0800\n> >>Subject: [PATCH] Fix a typo and add a comma in an error message in \n> >>git-svn\n> >>\n> >>Signed-off-by: David Reiss \n> >>---\n> >> git-svn.perl | 2 +-\n> >> 1 files changed, 1 insertions(+), 1 deletions(-)\n> >>\n> >>diff --git a/git-svn.perl b/git-svn.perl\n> >>index e3e00fd..981cdd6 100755\n> >>--- a/git-svn.perl\n> >>+++ b/git-svn.perl\n> >>@@ -391,7 +391,7 @@ sub cmd_set_tree {\n> >> sub cmd_dcommit {\n> >> \tmy $head = shift;\n> >> \tgit_cmd_try { command_oneline(qw/diff-index --quiet HEAD/) }\n> >>-\t\t'Cannot dcommit with a dirty index. Commit your changes \n> >>first'\n> >>+\t\t'Cannot dcommit with a dirty index. Commit your changes \n> >>first, '\n> >> \t\t. \"or stash them with `git stash'.\\n\";\n> >> \t$head ||= 'HEAD';\n> >> \tmy @refs;\n> >> \n> >\n> >I am not an English expert, but both seem acceptable to me. Anybody else\n> >agree/disagree?\n> > \n> \n> I don't think the comma matters very much, but having a space between \n> \"first\" and \"or\" is pretty important. :-)\n\nGood eyes, thanks Adam.\n\nAcked-by: Eric Wong \n\nPushed out to http://git.bogomips.org/git-svn.git\n\nAlong with several other changes\n(http://article.gmane.org/gmane.comp.version-control.git/65314)\n\n-- \nEric Wong\n"}]}