Merge branch 'jc/post-simplify' (early part) into tr/filter-branch

[git.git] / diff.c

diff --git a/diff.c b/diff.c
index 8746c60b9cb634bf78911c34cad1ba5a1f93d5ec..6954f992c2f268e2733af1e312a48ac3bc27799b 100644 (file)
--- a/diff.c
+++ b/diff.c
@@ -1631,7 +1631,8 @@ static void builtin_checkdiff(const char *name_a, const char *name_b,
                ecb.priv = &data;
                xdi_diff(&mf1, &mf2, &xpp, &xecfg, &ecb);
 
-               if (data.trailing_blanks_start) {
+               if ((data.ws_rule & WS_TRAILING_SPACE) &&
+                   data.trailing_blanks_start) {
                        fprintf(o->file, "%s:%d: ends with blank lines.\n",
                                data.filename, data.trailing_blanks_start);
                        data.status = 1; /* report errors */