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