threads / patch / 8072

patchCorrect error message in revert/cherry-pick

Subject: [PATCH] Correct error message in revert/cherry-pick

## tl;dr

One message between May 10, 2007 and May 10, 2007. Diffs are folded; open one to read it.

replies: 0people: 1as markdown or json

Shawn O. Pearce· May 10, 2007, 22:10 UTC · lore

We now write to MERGE_MSG, not .msg. I missed this earlier when I changed the target we write to.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
---
 builtin-revert.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
Show changes to builtin-revert.c +1 −1
diff --git a/builtin-revert.c b/builtin-revert.c
index 55d4fa1..ea2f15b 100644
--- a/builtin-revert.c
+++ b/builtin-revert.c
@@ -133,7 +133,7 @@ static void add_to_msg(const char *string)
 {
 	int len = strlen(string);
 	if (write_in_full(msg_fd, string, len) < 0)
-		die ("Could not write to .msg");
+		die ("Could not write to MERGE_MSG");
 }
 
 static void add_message_to_msg(const char *message)
-- 
1.5.2.rc2.754.g40686

← back to recent threads