# [PATCH] builtin-merge: fix a typo in an error message 5 messages from 2009-04-13 to 2009-04-27. Participants: Allan Caffee, Miklos Vajna, Junio C Hamano. Thread: https://gitlist.dev/t/18849 ## Allan Caffee, 2009-04-13 18:10 Subject: [PATCH] builtin-merge: fix a typo in an error message Message-ID: <20090413181008.GA8273@linux.vnet> URL: https://gitlist.dev/e/20090413181008.GA8273%40linux.vnet ``` Signed-off-by: Allan Caffee --- 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")); fprintf(fp, "\nConflicts:\n"); for (pos = 0; pos < active_nr; pos++) { struct cache_entry *ce = active_cache[pos]; -- 1.5.6.3 ``` ## Allan Caffee, 2009-04-13 21:41 Subject: Re: [PATCH] builtin-merge: fix a typo in an error message Message-ID: URL: https://gitlist.dev/e/b2e43f8f0904131441j4d808431mc2c87531221c8f4d%40mail.gmail.com In-Reply-To: <20090413181008.GA8273@linux.vnet> ``` On Mon, Apr 13, 2009 at 2:10 PM, Allan Caffee wrote: > > Signed-off-by: Allan Caffee > --- >  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, 2009-04-13 23:12 Subject: Re: [PATCH] builtin-merge: fix a typo in an error message Message-ID: <20090413231250.GA16990@genesis.frugalware.org> URL: https://gitlist.dev/e/20090413231250.GA16990%40genesis.frugalware.org In-Reply-To: <20090413181008.GA8273@linux.vnet> ``` On Mon, Apr 13, 2009 at 02:10:08PM -0400, Allan Caffee 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 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, 2009-04-27 15:41 Subject: Re: [PATCH] builtin-merge: fix a typo in an error message Message-ID: <20090427154151.GA9380@linux.vnet> URL: https://gitlist.dev/e/20090427154151.GA9380%40linux.vnet In-Reply-To: <20090413231250.GA16990@genesis.frugalware.org> ``` Hello Junio, On Tue, 14 Apr 2009, Miklos Vajna wrote: > On Mon, Apr 13, 2009 at 02:10:08PM -0400, Allan Caffee 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 Is this one ready for maint? (The issue dates back to 1c7b76be.) ``` ## Junio C Hamano, 2009-04-27 16:37 Subject: Re: [PATCH] builtin-merge: fix a typo in an error message Message-ID: <7vljpm59z7.fsf@gitster.siamese.dyndns.org> URL: https://gitlist.dev/e/7vljpm59z7.fsf%40gitster.siamese.dyndns.org In-Reply-To: <20090427154151.GA9380@linux.vnet> ``` Allan Caffee writes: > Hello Junio, > > On Tue, 14 Apr 2009, Miklos Vajna wrote: > >> On Mon, Apr 13, 2009 at 02:10:08PM -0400, Allan Caffee 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 > > Is this one ready for maint? (The issue dates back to 1c7b76be.) Indeed it is; I do not know how this one slipped. Thanks. ```