aboutsummaryrefslogtreecommitdiff
path: root/diff-helper.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@ppc970.osdl.org>2005-05-18 11:33:46 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-05-18 11:33:46 -0700
commite11b29c50c985f86f730893c71b0f8bd6f26c33a (patch)
tree8f54c74eda42b3706ccf89b47e889f0e5b2c68f8 /diff-helper.c
parentad87de7c9d191df4fbd5cbcb2f767520201688ae (diff)
downloadgit-e11b29c50c985f86f730893c71b0f8bd6f26c33a.tar.gz
git-e11b29c50c985f86f730893c71b0f8bd6f26c33a.tar.xz
diff-helper: pass unrecognized lines through unmodified
(and flush any pending renames)
Diffstat (limited to 'diff-helper.c')
-rw-r--r--diff-helper.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/diff-helper.c b/diff-helper.c
index 3ef57060d..2877ddc4d 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;
}