From 5bc08ee66f49beedb5327446ff147e92345df65c Mon Sep 17 00:00:00 2001
From: Johannes Sixt <johannes.sixt@telecom.at>
Date: Tue, 23 Jan 2007 13:20:18 +0100
Subject: [PATCH] Strip \r from the input.

Sometimes CRLF ends up in FETCH_HEAD. As a consequence, the fetch source
'.' is not recognized as a special case.
---
 builtin-fmt-merge-msg.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/builtin-fmt-merge-msg.c b/builtin-fmt-merge-msg.c
index 87d3d63ec7..252c7eb4b5 100644
--- a/builtin-fmt-merge-msg.c
+++ b/builtin-fmt-merge-msg.c
@@ -95,6 +95,8 @@ static int handle_line(char *line)
 		return 3;
 
 	if (line[len - 1] == '\n')
+		line[len - 1] = 0, --len;
+	if (line[len - 1] == '\r')
 		line[len - 1] = 0;
 	line += 42;