undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

diff -b: ignore whitespace at end of line

Browse Source 
This is _not_ the same as "treat eol as whitespace", since that would mean
that multiple empty lines would be treated as equal to e.g. a space.

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Johannes Schindelin 2006-12-03 19:25:34 +01:00 committed by Junio C Hamano
parent ba988a83f0
commit c7c24889bb
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
t/t4015-diff-whitespace.sh
View File

@ -109,12 +109,10 @@ index d99af23..8b32fb5 100644
+ whitespace at beginning + whitespace at beginning
whitespace change whitespace change
-whitespace in the middle -whitespace in the middle
-whitespace at end
+white space in the middle +white space in the middle
+whitespace at end whitespace at end
unchanged line unchanged line
-CR at endQ CR at endQ
+CR at end
EOF EOF
git-diff -b > out git-diff -b > out
test_expect_success 'another test, with -b' 'diff -u expect out' test_expect_success 'another test, with -b' 'diff -u expect out'

3
xdiff/xutils.c
View File

@ -230,7 +230,8 @@ unsigned long xdl_hash_record(char const **data, char const *top, long flags) {
while (ptr + 1 < top && isspace(ptr[1]) while (ptr + 1 < top && isspace(ptr[1])
&& ptr[1] != '\n') && ptr[1] != '\n')
ptr++; ptr++;
if (flags & XDF_IGNORE_WHITESPACE_CHANGE) { if (flags & XDF_IGNORE_WHITESPACE_CHANGE
&& ptr[1] != '\n') {
ha += (ha << 5); ha += (ha << 5);
ha ^= (unsigned long) ' '; ha ^= (unsigned long) ' ';
} }