patch-id-test: test stable and unstable behaviour
Verify that patch ID supports an algorithm that is stable against diff split and reordering. Signed-off-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Michael S. Tsirkin committed
Apr 27, 2014 at 21:15 UTC
8f2514e95fe142954d1dd4408cc7cb413a275844
1 file changed
+91
-11
t/t4204-patch-id.sh
+91
-11
@@ -5,27 +5,44 @@ test_description='git patch-id'
5
. ./test-lib.sh
6
7
test_expect_success 'setup' '
8
- test_commit initial foo a &&
9
- test_commit first foo b &&
10
- git checkout -b same HEAD^ &&
11
- test_commit same-msg foo b &&
12
- git checkout -b notsame HEAD^ &&
13
- test_commit notsame-msg foo c
8
+ as="a a a a a a a a" && # eight a
9
+ test_write_lines $as >foo &&
10
+ test_write_lines $as >bar &&
11
+ git add foo bar &&
12
+ git commit -a -m initial &&
13
+ test_write_lines $as b >foo &&
14
+ test_write_lines $as b >bar &&
15
+ git commit -a -m first &&
16
+ git checkout -b same master &&
17
+ git commit --amend -m same-msg &&
18
+ git checkout -b notsame master &&
19
+ echo c >foo &&
20
+ echo c >bar &&
21
+ git commit --amend -a -m notsame-msg &&
22
+ test_write_lines bar foo >bar-then-foo &&
23
+ test_write_lines foo bar >foo-then-bar
24
'
25
26
test_expect_success 'patch-id output is well-formed' '
17
- git log -p -1 | git patch-id > output &&
27
+ git log -p -1 | git patch-id >output &&
28
grep "^[a-f0-9]\{40\} $(git rev-parse HEAD)$" output
29
'
30
31
+#calculate patch id. Make sure output is not empty.
32
calc_patch_id () {
22
- git patch-id |
23
- sed "s# .*##" > patch-id_"$1"
33
+ name="$1"
34
+ shift
35
+ git patch-id "$@" |
36
+ sed "s/ .*//" >patch-id_"$name" &&
37
+ test_line_count -gt 0 patch-id_"$name"
38
+}
39
+
40
+get_top_diff () {
41
+ git log -p -1 "$@" -O bar-then-foo --
42
}
43
44
get_patch_id () {
27
- git log -p -1 "$1" | git patch-id |
28
- sed "s# .*##" > patch-id_"$1"
45
+ get_top_diff "$1" | calc_patch_id "$@"
46
}
47
48
test_expect_success 'patch-id detects equality' '
@@ -56,6 +73,69 @@ test_expect_success 'whitespace is irrelevant in footer' '
73
test_cmp patch-id_master patch-id_same
74
'
75
76
+cmp_patch_id () {
77
+ if
78
+ test "$1" = "relevant"
79
+ then
80
+ ! test_cmp patch-id_"$2" patch-id_"$3"
81
+ else
82
+ test_cmp patch-id_"$2" patch-id_"$3"
83
+ fi
84
+}
85
+
86
+test_patch_id_file_order () {
87
+ relevant="$1"
88
+ shift
89
+ name="order-${1}-$relevant"
90
+ shift
91
+ get_top_diff "master" | calc_patch_id "$name" "$@" &&
92
+ git checkout same &&
93
+ git format-patch -1 --stdout -O foo-then-bar |
94
+ calc_patch_id "ordered-$name" "$@" &&
95
+ cmp_patch_id $relevant "$name" "ordered-$name"
96
+
97
+}
98
+
99
+# combined test for options: add more tests here to make them
100
+# run with all options
101
+test_patch_id () {
102
+ test_patch_id_file_order "$@"
103
+}
104
+
105
+# small tests with detailed diagnostic for basic options.
106
+test_expect_success 'file order is irrelevant with --stable' '
107
+ test_patch_id_file_order irrelevant --stable --stable
108
+'
109
+
110
+test_expect_success 'file order is relevant with --unstable' '
111
+ test_patch_id_file_order relevant --unstable --unstable
112
+'
113
+
114
+#Now test various option combinations.
115
+test_expect_success 'default is unstable' '
116
+ test_patch_id relevant default
117
+'
118
+
119
+test_expect_success 'patchid.stable = true is stable' '
120
+ test_config patchid.stable true &&
121
+ test_patch_id irrelevant patchid.stable=true
122
+'
123
+
124
+test_expect_success 'patchid.stable = false is unstable' '
125
+ test_config patchid.stable false &&
126
+ test_patch_id relevant patchid.stable=false
127
+'
128
+
129
+test_expect_success '--unstable overrides patchid.stable = true' '
130
+ test_config patchid.stable true &&
131
+ test_patch_id relevant patchid.stable=true--unstable --unstable
132
+'
133
+
134
+test_expect_success '--stable overrides patchid.stable = false' '
135
+ test_config patchid.stable false &&
136
+ test_patch_id irrelevant patchid.stable=false--stable --stable
137
+'
138
+
139
test_expect_success 'patch-id supports git-format-patch MIME output' '
140
get_patch_id master &&
141
git checkout same &&