aboutsummaryrefslogtreecommitdiff
path: root/diff.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-12-09 10:36:10 -0800
committerJunio C Hamano <gitster@pobox.com>2010-12-09 10:36:10 -0800
commitae0a37cd6bc05b5ab511d0d1a541dc57d52753e6 (patch)
tree283e01c4e52e198664413234c87b2993796b3e25 /diff.c
parentd3334d9c444a22847e7add0f60c2e4a7243c151e (diff)
parent8837d33595b78dc4a52038856bc9a5c3f4b2ff50 (diff)
downloadgit-ae0a37cd6bc05b5ab511d0d1a541dc57d52753e6.tar.gz
git-ae0a37cd6bc05b5ab511d0d1a541dc57d52753e6.tar.xz
Merge branch 'cm/diff-check-at-eol' into maint
* cm/diff-check-at-eol: diff --check: correct line numbers of new blank lines at EOF
Diffstat (limited to 'diff.c')
-rw-r--r--diff.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/diff.c b/diff.c
index b829c0335..c8a7ceea0 100644
--- a/diff.c
+++ b/diff.c
@@ -2158,7 +2158,7 @@ static void builtin_checkdiff(const char *name_a, const char *name_b,
ecbdata.ws_rule = data.ws_rule;
check_blank_at_eof(&mf1, &mf2, &ecbdata);
- blank_at_eof = ecbdata.blank_at_eof_in_preimage;
+ blank_at_eof = ecbdata.blank_at_eof_in_postimage;
if (blank_at_eof) {
static char *err;