X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=sequencer.c;h=04fcfd893f6bcc5a0f54502c57f5fb61d17ea07e;hb=6307041dd2ca2f3507dc2791a1824d72302b0081;hp=145de786e14312add58b5df267963ac9193af09b;hpb=004fefa754a4aa3a99a5954da9fb805dbba8dbeb;p=thirdparty%2Fgit.git

diff --git a/sequencer.c b/sequencer.c
index 145de786e1..04fcfd893f 100644
--- a/sequencer.c
+++ b/sequencer.c
@@ -776,6 +776,9 @@ static int parse_insn_buffer(char *buf, struct todo_list *todo_list)
 
 		next_p = *eol ? eol + 1 /* skip LF */ : eol;
 
+		if (p != eol && eol[-1] == '\r')
+			eol--; /* strip Carriage Return */
+
 		item = append_new_todo(todo_list);
 		item->offset_in_buf = p - todo_list->buf.buf;
 		if (parse_insn_line(item, p, eol)) {