revision: forbid combining --graph and --no-walk

diff --git a/strbuf.c b/strbuf.c
index 0346e74a47d14ef13757cadfe2a0de778b5c4cc4..88cafd4a70b8179a4e911c18704fb4ab0f2a21f5 100644 (file)
--- a/strbuf.c
+++ b/strbuf.c
@@ -229,7 +229,8 @@ static void add_lines(struct strbuf *out,
                const char *next = memchr(buf, '\n', size);
                next = next ? (next + 1) : (buf + size);
 
-               prefix = (prefix2 && buf[0] == '\n') ? prefix2 : prefix1;
+               prefix = ((prefix2 && (buf[0] == '\n' || buf[0] == '\t'))
+                         ? prefix2 : prefix1);
                strbuf_addstr(out, prefix);
                strbuf_add(out, buf, next - buf);
                size -= next - buf;