From 3b8defd0a52fc1276816608e7bb24b628ab14c2e Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Thu, 13 Sep 2018 13:03:11 +0200 Subject: patch 8.1.0375: cannot use diff mode with Cygwin diff.exe Problem: Cannot use diff mode with Cygwin diff.exe. (Igor Forca) Solution: Skip over unrecognized lines in the diff output. --- src/diff.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/diff.c') diff --git a/src/diff.c b/src/diff.c index 0055cba5a..59daf1eeb 100644 --- a/src/diff.c +++ b/src/diff.c @@ -1600,6 +1600,10 @@ diff_read( && (tag_fgets(linebuf, LBUFLEN, fd) == 0) && (STRNCMP(line, "@@ ", 3) == 0)) diffstyle = DIFF_UNIFIED; + else + // Format not recognized yet, skip over this line. Cygwin diff + // may put a warning at the start of the file. + continue; } if (diffstyle == DIFF_ED) -- cgit v1.2.1