threads / patch / 18849

patchbuiltin-merge: fix a typo in an error message

Subject: [PATCH] builtin-merge: fix a typo in an error message

## tl;dr

5 messages between Apr 13, 2009 and Apr 27, 2009. Diffs are folded; open one to read it.

replies: 4people: 3as markdown or json

Allan Caffee· Apr 13, 2009, 18:10 UTC · lore

Signed-off-by: Allan Caffee <allan.caffee@gmail.com>
---
 builtin-merge.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

Show changes to builtin-merge.c +1 −1

diff --git a/builtin-merge.c b/builtin-merge.c
index 6a51823..0b58e5e 100644
--- a/builtin-merge.c
+++ b/builtin-merge.c
@@ -764,7 +764,7 @@ static int suggest_conflicts(void)
 
 	fp = fopen(git_path("MERGE_MSG"), "a");
 	if (!fp)
-		die("Could open %s for writing", git_path("MERGE_MSG"));
+		die("Could not open %s for writing", git_path("MERGE_MSG"));
 	fprintf(fp, "\nConflicts:\n");
 	for (pos = 0; pos < active_nr; pos++) {
 		struct cache_entry *ce = active_cache[pos];

-- 
1.5.6.3

Allan Caffee· Apr 13, 2009, 21:41 UTC · re: Allan Caffee · lore

Re: [PATCH] builtin-merge: fix a typo in an error message

On Mon, Apr 13, 2009 at 2:10 PM, Allan Caffee <allan.caffee@gmail.com> wrote:

Show 16 quoted lines

>
> Signed-off-by: Allan Caffee <allan.caffee@gmail.com>
> ---
>  builtin-merge.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/builtin-merge.c b/builtin-merge.c
> index 6a51823..0b58e5e 100644
> --- a/builtin-merge.c
> +++ b/builtin-merge.c
> @@ -764,7 +764,7 @@ static int suggest_conflicts(void)
>
>        fp = fopen(git_path("MERGE_MSG"), "a");
>        if (!fp)
> -               die("Could open %s for writing", git_path("MERGE_MSG"));
> +               die("Could not open %s for writing", git_path("MERGE_MSG"));

On second thought this commit message should probably read something more like:

builtin-merge.c: correct error message for failed open

Since the original message is actually wrong.

Miklos Vajna· Apr 13, 2009, 23:12 UTC · re: Allan Caffee · lore

Re: [PATCH] builtin-merge: fix a typo in an error message

On Mon, Apr 13, 2009 at 02:10:08PM -0400, Allan Caffee <allan.caffee@gmail.com> wrote:

> -		die("Could open %s for writing", git_path("MERGE_MSG"));
> +		die("Could not open %s for writing", git_path("MERGE_MSG"));

Acked-by: Miklos Vajna <vmiklos@frugalware.org>

Thanks.

PS: Please use 'unset followup_to' when sending messages to the git
list, see
http://thread.gmane.org/gmane.comp.version-control.git/83140/focus=83234.

Allan Caffee· Apr 27, 2009, 15:41 UTC · re: Miklos Vajna · lore

Re: [PATCH] builtin-merge: fix a typo in an error message

Hello Junio,

On Tue, 14 Apr 2009, Miklos Vajna wrote:

Show 5 quoted lines

> On Mon, Apr 13, 2009 at 02:10:08PM -0400, Allan Caffee <allan.caffee@gmail.com> wrote:
> > -		die("Could open %s for writing", git_path("MERGE_MSG"));
> > +		die("Could not open %s for writing", git_path("MERGE_MSG"));
> 
> Acked-by: Miklos Vajna <vmiklos@frugalware.org>

Is this one ready for maint?  (The issue dates back to 1c7b76be.)

Junio C Hamano· Apr 27, 2009, 16:37 UTC · re: Allan Caffee · lore

Re: [PATCH] builtin-merge: fix a typo in an error message

Allan Caffee <allan.caffee@gmail.com> writes:

Show 11 quoted lines

> Hello Junio,
>
> On Tue, 14 Apr 2009, Miklos Vajna wrote:
>
>> On Mon, Apr 13, 2009 at 02:10:08PM -0400, Allan Caffee <allan.caffee@gmail.com> wrote:
>> > -		die("Could open %s for writing", git_path("MERGE_MSG"));
>> > +		die("Could not open %s for writing", git_path("MERGE_MSG"));
>> 
>> Acked-by: Miklos Vajna <vmiklos@frugalware.org>
>
> Is this one ready for maint?  (The issue dates back to 1c7b76be.)

Indeed it is; I do not know how this one slipped.

Thanks.