mirror of
https://github.com/git/git
synced 2024-08-24 18:26:02 +00:00
Fix "apply --reverse" with regard to whitespace
"git apply" used to take check the whitespace in the wrong direction. Noticed by Daniel Barkalow. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
ed5f07a6fd
commit
5fda48d67c
|
@ -1003,12 +1003,16 @@ static int parse_fragment(char *line, unsigned long size, struct patch *patch, s
|
|||
trailing++;
|
||||
break;
|
||||
case '-':
|
||||
if (apply_in_reverse &&
|
||||
new_whitespace != nowarn_whitespace)
|
||||
check_whitespace(line, len);
|
||||
deleted++;
|
||||
oldlines--;
|
||||
trailing = 0;
|
||||
break;
|
||||
case '+':
|
||||
if (new_whitespace != nowarn_whitespace)
|
||||
if (!apply_in_reverse &&
|
||||
new_whitespace != nowarn_whitespace)
|
||||
check_whitespace(line, len);
|
||||
added++;
|
||||
newlines--;
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue