From: Linus Torvalds <torvalds@ppc970.osdl.org>
Date: Wed, 18 May 2005 18:33:46 +0000 (-0700)
Subject: diff-helper: pass unrecognized lines through unmodified
X-Git-Tag: v0.99~554
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=e11b29c50c985f86f730893c71b0f8bd6f26c33a;p=git.git

diff-helper: pass unrecognized lines through unmodified

(and flush any pending renames)
---

diff --git a/diff-helper.c b/diff-helper.c
index 3ef57060..2877ddc4 100644
--- a/diff-helper.c
+++ b/diff-helper.c
@@ -268,11 +268,12 @@ int main(int ac, const char **av) {
 		if (sb.eof)
 			break;
 		status = parse_diff_raw_output(sb.buf, av+1, ac-1, reverse);
-		if (status)
-			fprintf(stderr, "cannot parse %s\n", sb.buf);
+		if (status) {
+			flush_renames(av+1, ac-1, reverse);
+			printf("%s%c", sb.buf, line_termination);
+		}
 	}
 
-	if (detect_rename)
-		flush_renames(av+1, ac-1, reverse);
+	flush_renames(av+1, ac-1, reverse);
 	return 0;
 }