Merge branch 'mv/dashless'
[tgit.git] / t / t4128-apply-root.sh
blob2dd0c75f964b690977e40a3a8235cc324dc6826e
1 #!/bin/sh
3 test_description='apply same filename'
5 . ./test-lib.sh
7 test_expect_success 'setup' '
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
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
26 test_expect_success 'apply --directory -p (1)' '
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)
34 test_expect_success 'apply --directory -p (2) ' '
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)
43 test_done