Merge branch 'mg/push-repo-option-doc' into maint
[git/mingw.git] / t / t4116-apply-reverse.sh
blobce8567f496438c18501f30632269ecbe7de15fd3
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 test_cmp /dev/null diff
49 test_expect_success 'setup separate repository lacking postimage' '
51 git archive --format=tar --prefix=initial/ initial | $TAR xf - &&
53 cd initial && git init && git add .
54 ) &&
56 git archive --format=tar --prefix=second/ second | $TAR xf - &&
58 cd second && git init && git add .
63 test_expect_success 'apply in forward without postimage' '
65 T0=$(git rev-parse "second^{tree}") &&
67 cd initial &&
68 git apply --index --binary ../patch &&
69 T1=$(git write-tree) &&
70 test "$T0" = "$T1"
74 test_expect_success 'apply in reverse without postimage' '
76 T0=$(git rev-parse "initial^{tree}") &&
78 cd second &&
79 git apply --index --binary --reverse ../patch &&
80 T1=$(git write-tree) &&
81 test "$T0" = "$T1"
85 test_expect_success 'reversing a whitespace introduction' '
86 sed "s/a/a /" < file1 > file1.new &&
87 mv file1.new file1 &&
88 git diff | git apply --reverse --whitespace=error
91 test_done