X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft4116-apply-reverse.sh;h=9ae2b3a8efaad4430bbcea02152470b064263b2b;hb=e340d7d3fa1c5b9a6e7af2e3ee3d526064e56bea;hp=74f5c2a5755c8d29045498031c0bc3721a00b9c7;hpb=7f0f4fa4374edfe2050b3ab636f43ee80daa63f2;p=git.git diff --git a/t/t4116-apply-reverse.sh b/t/t4116-apply-reverse.sh index 74f5c2a57..9ae2b3a8e 100755 --- a/t/t4116-apply-reverse.sh +++ b/t/t4116-apply-reverse.sh @@ -3,7 +3,7 @@ # Copyright (c) 2005 Junio C Hamano # -test_description='git-apply in reverse +test_description='git apply in reverse ' @@ -42,7 +42,7 @@ test_expect_success 'apply in reverse' ' git reset --hard second && git apply --reverse --binary --index patch && git diff >diff && - diff -u /dev/null diff + git diff /dev/null diff ' @@ -50,12 +50,12 @@ test_expect_success 'setup separate repository lacking postimage' ' git tar-tree initial initial | tar xf - && ( - cd initial && git init-db && git add . + cd initial && git init && git add . ) && git tar-tree second second | tar xf - && ( - cd second && git init-db && git add . + cd second && git init && git add . ) ' @@ -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