* [PATCH] builtin-merge: fix a typo in an error message
@ 2009-04-13 18:10 Allan Caffee
2009-04-13 21:41 ` Allan Caffee
2009-04-13 23:12 ` Miklos Vajna
0 siblings, 2 replies; 5+ messages in thread
From: Allan Caffee @ 2009-04-13 18:10 UTC (permalink / raw)
To: git
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"));
fprintf(fp, "\nConflicts:\n");
for (pos = 0; pos < active_nr; pos++) {
struct cache_entry *ce = active_cache[pos];
--
1.5.6.3
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] builtin-merge: fix a typo in an error message
2009-04-13 18:10 [PATCH] builtin-merge: fix a typo in an error message Allan Caffee
@ 2009-04-13 21:41 ` Allan Caffee
2009-04-13 23:12 ` Miklos Vajna
1 sibling, 0 replies; 5+ messages in thread
From: Allan Caffee @ 2009-04-13 21:41 UTC (permalink / raw)
To: git
On Mon, Apr 13, 2009 at 2:10 PM, Allan Caffee <allan.caffee@gmail.com> wrote:
>
> 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.
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] builtin-merge: fix a typo in an error message
2009-04-13 18:10 [PATCH] builtin-merge: fix a typo in an error message Allan Caffee
2009-04-13 21:41 ` Allan Caffee
@ 2009-04-13 23:12 ` Miklos Vajna
2009-04-27 15:41 ` Allan Caffee
1 sibling, 1 reply; 5+ messages in thread
From: Miklos Vajna @ 2009-04-13 23:12 UTC (permalink / raw)
To: Allan Caffee; +Cc: git
[-- Attachment #1: Type: text/plain, Size: 426 bytes --]
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.
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] builtin-merge: fix a typo in an error message
2009-04-13 23:12 ` Miklos Vajna
@ 2009-04-27 15:41 ` Allan Caffee
2009-04-27 16:37 ` Junio C Hamano
0 siblings, 1 reply; 5+ messages in thread
From: Allan Caffee @ 2009-04-27 15:41 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git, Miklos Vajna
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.)
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] builtin-merge: fix a typo in an error message
2009-04-27 15:41 ` Allan Caffee
@ 2009-04-27 16:37 ` Junio C Hamano
0 siblings, 0 replies; 5+ messages in thread
From: Junio C Hamano @ 2009-04-27 16:37 UTC (permalink / raw)
To: Allan Caffee; +Cc: Miklos Vajna, git
Allan Caffee <allan.caffee@gmail.com> writes:
> 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.
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2009-04-27 16:37 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-04-13 18:10 [PATCH] builtin-merge: fix a typo in an error message Allan Caffee
2009-04-13 21:41 ` Allan Caffee
2009-04-13 23:12 ` Miklos Vajna
2009-04-27 15:41 ` Allan Caffee
2009-04-27 16:37 ` Junio C Hamano
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).