]> git.ipfire.org Git - thirdparty/git.git/blob - t/t4128-apply-root.sh
Merge branch 'af/maint-install-no-handlink' into maint
[thirdparty/git.git] / t / t4128-apply-root.sh
1 #!/bin/sh
2
3 test_description='apply same filename'
4
5 . ./test-lib.sh
6
7 test_expect_success 'setup' '
8
9 mkdir -p some/sub/dir &&
10 echo Hello > some/sub/dir/file &&
11 git add some/sub/dir/file &&
12 git commit -m initial &&
13 git tag initial
14
15 '
16
17 cat > patch << EOF
18 diff a/bla/blub/dir/file b/bla/blub/dir/file
19 --- a/bla/blub/dir/file
20 +++ b/bla/blub/dir/file
21 @@ -1,1 +1,1 @@
22 -Hello
23 +Bello
24 EOF
25
26 test_expect_success 'apply --directory -p (1)' '
27
28 git apply --directory=some/sub -p3 --index patch &&
29 test Bello = $(git show :some/sub/dir/file) &&
30 test Bello = $(cat some/sub/dir/file)
31
32 '
33
34 test_expect_success 'apply --directory -p (2) ' '
35
36 git reset --hard initial &&
37 git apply --directory=some/sub/ -p3 --index patch &&
38 test Bello = $(git show :some/sub/dir/file) &&
39 test Bello = $(cat some/sub/dir/file)
40
41 '
42
43 test_done