blob: 3db3175ff95d4cea53bc5cc35d330f8b06f5d91c (
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
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
|
#!/bin/sh
#
# Copyright (c) 2005 Junio C Hamano
#
test_description='git apply handling copy/rename patch'
. ./test-lib.sh
test_expect_success setup '
cat >test-patch <<-\EOF &&
diff --git a/foo b/bar
similarity index 47%
rename from foo
rename to bar
--- a/foo
+++ b/bar
@@ -1 +1 @@
-This is foo
+This is bar
EOF
echo "This is foo" >foo &&
chmod +x foo &&
git update-index --add foo
'
test_expect_success apply '
git apply --index --stat --summary --apply test-patch
'
test_expect_success FILEMODE validate '
test -x bar
'
test_expect_success 'apply reverse' '
git apply -R --index --stat --summary --apply test-patch &&
test "$(cat foo)" = "This is foo"
'
test_expect_success 'apply copy' '
cat >test-patch <<-\EOF
diff --git a/foo b/bar
similarity index 47%
copy from foo
copy to bar
--- a/foo
+++ b/bar
@@ -1 +1 @@
-This is foo
+This is bar
EOF
'
test_expect_success 'apply copy' '
git apply --index --stat --summary --apply test-patch &&
test "$(cat bar)" = "This is bar" &&
test "$(cat foo)" = "This is foo"
'
test_expect_success 'apply rename and rewrite' '
cat >test-patch <<-\EOF &&
diff --git a/foo b/bar
similarity index 47%
rename from foo
rename to bar
--- a/foo
+++ b/bar
@@ -1 +1 @@
-This is foo
+This is bar
diff --git a/foo b/foo
dissimilarity index 82%
--- a/foo
+++ a/foo
@@ -1 +1 @@
-This is foo
+This is still foo
EOF
rm -f foo bar &&
echo "This is foo" >foo &&
git update-index --add --remove foo bar &&
git apply --index test-patch &&
test "$(cat bar)" = "This is bar" &&
test "$(cat foo)" = "This is still foo"
'
test_done
|
