diff options
| author |  Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-18 11:33:46 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-18 11:33:46 -0700 |
| commit | e11b29c50c985f86f730893c71b0f8bd6f26c33a (patch) | |
| tree | 8f54c74eda42b3706ccf89b47e889f0e5b2c68f8 | |
| parent | strbuf: allow zero-length lines (diff) | |
| download | tgif-e11b29c50c985f86f730893c71b0f8bd6f26c33a.tar.xz | |
diff-helper: pass unrecognized lines through unmodified
(and flush any pending renames)
| -rw-r--r-- | diff-helper.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/diff-helper.c b/diff-helper.c index 3ef57060d6..2877ddc4df 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; } |