{"thread":{"id":"18849","subject":"[PATCH] builtin-merge: fix a typo in an error message","startedAt":"2009-04-13T18:10:08Z","lastAt":"2009-04-27T16:37:16Z","messageCount":5,"participants":["Allan Caffee","Miklos Vajna","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"111206","messageId":"20090413181008.GA8273@linux.vnet","threadId":"18849","inReplyTo":null,"subject":"[PATCH] builtin-merge: fix a typo in an error message","fromName":"Allan Caffee","fromEmail":"allan.caffee@gmail.com","sentAt":"2009-04-13T18:10:08Z","receivedAt":"2009-04-13T18:10:08Z","isPatch":true,"sender":{"key":"allan.caffee@gmail.com","avatar":"https://avatars.githubusercontent.com/u/114759?v=4"},"body":"\nSigned-off-by: Allan Caffee \n---\n builtin-merge.c | 2 +-\n 1 files changed, 1 insertions(+), 1 deletions(-)\n\ndiff --git a/builtin-merge.c b/builtin-merge.c\nindex 6a51823..0b58e5e 100644\n--- a/builtin-merge.c\n+++ b/builtin-merge.c\n@@ -764,7 +764,7 @@ static int suggest_conflicts(void)\n \n \tfp = fopen(git_path(\"MERGE_MSG\"), \"a\");\n \tif (!fp)\n-\t\tdie(\"Could open %s for writing\", git_path(\"MERGE_MSG\"));\n+\t\tdie(\"Could not open %s for writing\", git_path(\"MERGE_MSG\"));\n \tfprintf(fp, \"\\nConflicts:\\n\");\n \tfor (pos = 0; pos < active_nr; pos++) {\n \t\tstruct cache_entry *ce = active_cache[pos];\n-- \n1.5.6.3\n"},{"id":"111239","messageId":"b2e43f8f0904131441j4d808431mc2c87531221c8f4d@mail.gmail.com","threadId":"18849","inReplyTo":"20090413181008.GA8273@linux.vnet","subject":"Re: [PATCH] builtin-merge: fix a typo in an error message","fromName":"Allan Caffee","fromEmail":"allan.caffee@gmail.com","sentAt":"2009-04-13T21:41:15Z","receivedAt":"2009-04-13T21:41:15Z","isPatch":true,"sender":{"key":"allan.caffee@gmail.com","avatar":"https://avatars.githubusercontent.com/u/114759?v=4"},"body":"On Mon, Apr 13, 2009 at 2:10 PM, Allan Caffee wrote:\n>\n> Signed-off-by: Allan Caffee \n> ---\n>  builtin-merge.c |    2 +-\n>  1 files changed, 1 insertions(+), 1 deletions(-)\n>\n> diff --git a/builtin-merge.c b/builtin-merge.c\n> index 6a51823..0b58e5e 100644\n> --- a/builtin-merge.c\n> +++ b/builtin-merge.c\n> @@ -764,7 +764,7 @@ static int suggest_conflicts(void)\n>\n>        fp = fopen(git_path(\"MERGE_MSG\"), \"a\");\n>        if (!fp)\n> -               die(\"Could open %s for writing\", git_path(\"MERGE_MSG\"));\n> +               die(\"Could not open %s for writing\", git_path(\"MERGE_MSG\"));\n\nOn second thought this commit message should probably read something more like:\n\nbuiltin-merge.c: correct error message for failed open\n\nSince the original message is actually wrong.\n"},{"id":"111250","messageId":"20090413231250.GA16990@genesis.frugalware.org","threadId":"18849","inReplyTo":"20090413181008.GA8273@linux.vnet","subject":"Re: [PATCH] builtin-merge: fix a typo in an error message","fromName":"Miklos Vajna","fromEmail":"vmiklos@frugalware.org","sentAt":"2009-04-13T23:12:50Z","receivedAt":"2009-04-13T23:12:50Z","isPatch":true,"sender":{"key":"vmiklos@frugalware.org","avatar":"https://gravatar.com/avatar/401c1cbbb3a5d13e650c691a2c71d6fd0b80df1a01bc74d9f1972675dd58f2bd?d=mp&s=160"},"body":"On Mon, Apr 13, 2009 at 02:10:08PM -0400, Allan Caffee wrote:\n> -\t\tdie(\"Could open %s for writing\", git_path(\"MERGE_MSG\"));\n> +\t\tdie(\"Could not open %s for writing\", git_path(\"MERGE_MSG\"));\n\nAcked-by: Miklos Vajna \n\nThanks.\n\nPS: Please use 'unset followup_to' when sending messages to the git\nlist, see\nhttp://thread.gmane.org/gmane.comp.version-control.git/83140/focus=83234.\n"},{"id":"112424","messageId":"20090427154151.GA9380@linux.vnet","threadId":"18849","inReplyTo":"20090413231250.GA16990@genesis.frugalware.org","subject":"Re: [PATCH] builtin-merge: fix a typo in an error message","fromName":"Allan Caffee","fromEmail":"allan.caffee@gmail.com","sentAt":"2009-04-27T15:41:51Z","receivedAt":"2009-04-27T15:41:51Z","isPatch":true,"sender":{"key":"allan.caffee@gmail.com","avatar":"https://avatars.githubusercontent.com/u/114759?v=4"},"body":"Hello Junio,\n\nOn Tue, 14 Apr 2009, Miklos Vajna wrote:\n\n> On Mon, Apr 13, 2009 at 02:10:08PM -0400, Allan Caffee wrote:\n> > -\t\tdie(\"Could open %s for writing\", git_path(\"MERGE_MSG\"));\n> > +\t\tdie(\"Could not open %s for writing\", git_path(\"MERGE_MSG\"));\n> \n> Acked-by: Miklos Vajna \n\nIs this one ready for maint? (The issue dates back to 1c7b76be.)\n"},{"id":"112436","messageId":"7vljpm59z7.fsf@gitster.siamese.dyndns.org","threadId":"18849","inReplyTo":"20090427154151.GA9380@linux.vnet","subject":"Re: [PATCH] builtin-merge: fix a typo in an error message","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2009-04-27T16:37:16Z","receivedAt":"2009-04-27T16:37:16Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Allan Caffee writes:\n\n> Hello Junio,\n>\n> On Tue, 14 Apr 2009, Miklos Vajna wrote:\n>\n>> On Mon, Apr 13, 2009 at 02:10:08PM -0400, Allan Caffee wrote:\n>> > -\t\tdie(\"Could open %s for writing\", git_path(\"MERGE_MSG\"));\n>> > +\t\tdie(\"Could not open %s for writing\", git_path(\"MERGE_MSG\"));\n>> \n>> Acked-by: Miklos Vajna \n>\n> Is this one ready for maint? (The issue dates back to 1c7b76be.)\n\nIndeed it is; I do not know how this one slipped.\n\nThanks.\n"}]}