git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] Correct error message in revert/cherry-pick
@ 2007-05-10 22:10 Shawn O. Pearce
  0 siblings, 0 replies; only message in thread
From: Shawn O. Pearce @ 2007-05-10 22:10 UTC (permalink / raw)
  To: Junio C Hamano; +Cc: git

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(-)

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

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2007-05-10 22:10 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-05-10 22:10 [PATCH] Correct error message in revert/cherry-pick Shawn O. Pearce

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).