Merge commit 'junio/next' into next
[git/platforms/storm.git] / t / t4116-apply-reverse.sh
blobae9b8fc3215f04177e2020b3a04897fbc83e199b
1 #!/bin/sh
3 # Copyright (c) 2005 Junio C Hamano
6 test_description='git apply in reverse
10 . ./test-lib.sh
12 test_expect_success setup '
14 for i in a b c d e f g h i j k l m n; do echo $i; done >file1 &&
15 perl -pe "y/ijk/\\000\\001\\002/" <file1 >file2 &&
17 git add file1 file2 &&
18 git commit -m initial &&
19 git tag initial &&
21 for i in a b c g h i J K L m o n p q; do echo $i; done >file1 &&
22 perl -pe "y/mon/\\000\\001\\002/" <file1 >file2 &&
24 git commit -a -m second &&
25 git tag second &&
27 git diff --binary initial second >patch
31 test_expect_success 'apply in forward' '
33 T0=`git rev-parse "second^{tree}"` &&
34 git reset --hard initial &&
35 git apply --index --binary patch &&
36 T1=`git write-tree` &&
37 test "$T0" = "$T1"
40 test_expect_success 'apply in reverse' '
42 git reset --hard second &&
43 git apply --reverse --binary --index patch &&
44 git diff >diff &&
45 : > empty &&
46 git diff empty diff
50 test_expect_success 'setup separate repository lacking postimage' '
52 git tar-tree initial initial | tar xf - &&
54 cd initial && git init && git add .
55 ) &&
57 git tar-tree second second | tar xf - &&
59 cd second && git init && git add .
64 test_expect_success 'apply in forward without postimage' '
66 T0=`git rev-parse "second^{tree}"` &&
68 cd initial &&
69 git apply --index --binary ../patch &&
70 T1=`git write-tree` &&
71 test "$T0" = "$T1"
75 test_expect_success 'apply in reverse without postimage' '
77 T0=`git rev-parse "initial^{tree}"` &&
79 cd second &&
80 git apply --index --binary --reverse ../patch &&
81 T1=`git write-tree` &&
82 test "$T0" = "$T1"
86 test_expect_success 'reversing a whitespace introduction' '
87 sed "s/a/a /" < file1 > file1.new &&
88 mv file1.new file1 &&
89 git diff | git apply --reverse --whitespace=error
92 test_done