Skip to contentSkip to conversation

builtin-merge: fix a typo in an error message

PATCH In review Allan Caffee 3 participants 5 messages Jun 15, 2016

lore
Share & tools
lore

Allan Caffee

author
#0 lore raw

PATCH 1/1 builtin-merge: fix a typo in an error message

Signed-off-by Allan Caffee <[email protected]>
---
 builtin-merge.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
builtin-merge.c +1 -1
index 6a51823..0b58e5e 100644
@@ -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];
Signature · 1 line
1.5.6.3
Acked-by on v1 1/1
#1 lore raw

builtin-merge.c static int suggest_conflicts(void) · line 767

Quoted 2 lines · Allan Caffee
builtin-merge.c +1 -1
-		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 <[email protected]>

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.

author
#2 lore raw

Hello Junio,

Quoted 5 lines · Miklos Vajna

builtin-merge.c static int suggest_conflicts(void) · line 767

Quoted 2 lines · Allan Caffee
builtin-merge.c +1 -1
-		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 <[email protected]>

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

#3 lore raw
Quoted 11 lines · Allan Caffee

Hello Junio,

Quoted 5 lines · Miklos Vajna

builtin-merge.c static int suggest_conflicts(void) · line 767

Quoted 2 lines · Allan Caffee
builtin-merge.c +1 -1
-		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 <[email protected]>

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

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

Thanks.

author
#4 lore raw
In reply to Allan Caffee
Quoted 11 lines · Allan Caffee
Signed-off-by Allan Caffee <[email protected]>

---
 builtin-merge.c |    2 +-

 1 files changed, 1 insertions(+), 1 deletions(-)
builtin-merge.c +0 -0
index 6a51823..0b58e5e 100644

builtin-merge.c static int suggest_conflicts(void) · line 767

Quoted 5 lines
builtin-merge.c +1 -1
@@ -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.