From 2b4d90fd47628ff20d676b1b1d2b75c58e9ddc70 Mon Sep 17 00:00:00 2001 From: Karsten Blees Date: Thu, 7 May 2015 14:12:22 +0200 Subject: [PATCH] fixup! mingw: Support `git_terminal_prompt` with more terminals Also strip trailing CRLF instead of just LF or just CR. Signed-off-by: Karsten Blees --- compat/terminal.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/compat/terminal.c b/compat/terminal.c index 9e3c7f37cb..b24d67cef7 100644 --- a/compat/terminal.c +++ b/compat/terminal.c @@ -137,10 +137,8 @@ static char *xterm_prompt(const char *prompt, int echo) goto ret; } - if (len && buffer.buf[len - 1] == '\n') - strbuf_setlen(&buffer, len - 1); - if (len && buffer.buf[len - 1] == '\r') - strbuf_setlen(&buffer, len - 1); + strbuf_strip_suffix(&buffer, "\n"); + strbuf_strip_suffix(&buffer, "\r"); ret: if (!code)