Merge branch 'cm/diff-check-at-eol' into next

* cm/diff-check-at-eol:
  diff --check: correct line numbers of new blank lines at EOF

diff --cc diff.c
Simple merge

diff --cc t/t4019-diff-wserror.sh
index f7c85ec604df5e037990065ab9d3d82d86587076,87df0aeb59ecb22f07454ce08172f8cfa4940591..3fa836f9d3c19f351ce5451049eb191776cbd4a5
--- 1/t/t4019-diff-wserror.sh
--- 2/t/t4019-diff-wserror.sh
+++ b/t/t4019-diff-wserror.sh
@@@ -179,8 -178,17 +179,17 @@@ test_expect_success 'trailing empty lin
  
  '
  
+ test_expect_success 'checkdiff shows correct line number for trailing blank lines' '
+ 
+       printf "a\nb\n" > G &&
+       git add G &&
+       printf "x\nx\nx\na\nb\nc\n\n" > G &&
+       [ "$(git diff --check -- G)" = "G:7: new blank line at EOF." ]
+ 
+ '
+ 
  test_expect_success 'do not color trailing cr in context' '
 -      git config --unset core.whitespace
 +      test_might_fail git config --unset core.whitespace &&
        rm -f .gitattributes &&
        echo AAAQ | tr Q "\015" >G &&
        git add G &&