X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft4116-apply-reverse.sh;h=b1d35ab04db88f849c024208a541c0a594f0ed3b;hb=04f32cf1b31717bf0b7cbbc00783a4107cc19cfd;hp=aa2c869e0e7ffcfba2e4349cf5af0e2badcb5516;hpb=67583917e9a2a85605c1123a62c8883593e7e889;p=git.git diff --git a/t/t4116-apply-reverse.sh b/t/t4116-apply-reverse.sh index aa2c869e0..b1d35ab04 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 ' @@ -12,14 +12,14 @@ test_description='git-apply in reverse test_expect_success setup ' for i in a b c d e f g h i j k l m n; do echo $i; done >file1 && - tr "[ijk]" '\''[\0\1\2]'\'' file2 && + tr "ijk" '\''\000\001\002'\'' file2 && git add file1 file2 && git commit -m initial && git tag initial && for i in a b c g h i J K L m o n p q; do echo $i; done >file1 && - tr "[mon]" '\''[\0\1\2]'\'' file2 && + tr "mon" '\''\000\001\002'\'' file2 && git commit -a -m second && git tag second && @@ -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 ' @@ -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