development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-10-03 23:29:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse source 
* cm/diff-check-at-eol:
  diff --check: correct line numbers of new blank lines at EOF
This commit is contained in:
Junio C Hamano 2010-11-29 17:52:31 -08:00
parent f565f6e065 8837d33595
commit 039e84e30d
2 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
diff.c
View file

@ -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;

9
t/t4019-diff-wserror.sh
View file

@ -179,6 +179,15 @@ test_expect_success 'trailing empty lines (2)' '
'
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' '
test_might_fail git config --unset core.whitespace &&
rm -f .gitattributes &&