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

Merge branch 'maint'

Browse Source 
* maint:
  Fix "apply --reverse" with regard to whitespace
This commit is contained in:
Junio C Hamano 2007-07-07 12:29:09 -07:00
commit 0707a9d6f2
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
builtin-apply.c
View File

@ -1003,12 +1003,16 @@ static int parse_fragment(char *line, unsigned long size, struct patch *patch, s
trailing++; trailing++;
break; break;
case '-': case '-':
if (apply_in_reverse &&
new_whitespace != nowarn_whitespace)
check_whitespace(line, len);
deleted++; deleted++;
oldlines--; oldlines--;
trailing = 0; trailing = 0;
break; break;
case '+': case '+':
if (new_whitespace != nowarn_whitespace) if (!apply_in_reverse &&
new_whitespace != nowarn_whitespace)
check_whitespace(line, len); check_whitespace(line, len);
added++; added++;
newlines--; newlines--;

6
t/t4116-apply-reverse.sh
View File

@ -82,4 +82,10 @@ test_expect_success 'apply in reverse without postimage' '
) )
' '
test_expect_success 'reversing a whitespace introduction' '
sed "s/a/a /" < file1 > file1.new &&
mv file1.new file1 &&
git diff | git apply --reverse --whitespace=error
'
test_done test_done