t7110-reset-merge: modernize test format
Some tests still use the old format with four spaces indentation. Standardize the tests to the new format with tab indentation. Signed-off-by: John Cai <johncai86@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
John Cai committed
May 20, 2023 at 16:13 UTC
a32a724b034a2cafdde6ab4c7fde396df1687175
1 file changed
+157
-157
t/t7110-reset-merge.sh
+157
-157
@@ -9,17 +9,17 @@ TEST_PASSES_SANITIZE_LEAK=true
9
. ./test-lib.sh
10
11
test_expect_success setup '
12
- printf "line %d\n" 1 2 3 >file1 &&
13
- cat file1 >file2 &&
14
- git add file1 file2 &&
15
- test_tick &&
16
- git commit -m "Initial commit" &&
17
- git tag initial &&
18
- echo line 4 >>file1 &&
19
- cat file1 >file2 &&
20
- test_tick &&
21
- git commit -m "add line 4 to file1" file1 &&
22
- git tag second
12
+ printf "line %d\n" 1 2 3 >file1 &&
13
+ cat file1 >file2 &&
14
+ git add file1 file2 &&
15
+ test_tick &&
16
+ git commit -m "Initial commit" &&
17
+ git tag initial &&
18
+ echo line 4 >>file1 &&
19
+ cat file1 >file2 &&
20
+ test_tick &&
21
+ git commit -m "add line 4 to file1" file1 &&
22
+ git tag second
23
'
24
25
# The next test will test the following:
@@ -29,19 +29,19 @@ test_expect_success setup '
29
# file1: C C C D --merge D D D
30
# file2: C D D D --merge C D D
31
test_expect_success 'reset --merge is ok with changes in file it does not touch' '
32
- git reset --merge HEAD^ &&
33
- ! grep 4 file1 &&
34
- grep 4 file2 &&
35
- test "$(git rev-parse HEAD)" = "$(git rev-parse initial)" &&
36
- test -z "$(git diff --cached)"
32
+ git reset --merge HEAD^ &&
33
+ ! grep 4 file1 &&
34
+ grep 4 file2 &&
35
+ test "$(git rev-parse HEAD)" = "$(git rev-parse initial)" &&
36
+ test -z "$(git diff --cached)"
37
'
38
39
test_expect_success 'reset --merge is ok when switching back' '
40
- git reset --merge second &&
41
- grep 4 file1 &&
42
- grep 4 file2 &&
43
- test "$(git rev-parse HEAD)" = "$(git rev-parse second)" &&
44
- test -z "$(git diff --cached)"
40
+ git reset --merge second &&
41
+ grep 4 file1 &&
42
+ grep 4 file2 &&
43
+ test "$(git rev-parse HEAD)" = "$(git rev-parse second)" &&
44
+ test -z "$(git diff --cached)"
45
'
46
47
# The next test will test the following:
@@ -51,21 +51,21 @@ test_expect_success 'reset --merge is ok when switching back' '
51
# file1: C C C D --keep D D D
52
# file2: C D D D --keep C D D
53
test_expect_success 'reset --keep is ok with changes in file it does not touch' '
54
- git reset --hard second &&
55
- cat file1 >file2 &&
56
- git reset --keep HEAD^ &&
57
- ! grep 4 file1 &&
58
- grep 4 file2 &&
59
- test "$(git rev-parse HEAD)" = "$(git rev-parse initial)" &&
60
- test -z "$(git diff --cached)"
54
+ git reset --hard second &&
55
+ cat file1 >file2 &&
56
+ git reset --keep HEAD^ &&
57
+ ! grep 4 file1 &&
58
+ grep 4 file2 &&
59
+ test "$(git rev-parse HEAD)" = "$(git rev-parse initial)" &&
60
+ test -z "$(git diff --cached)"
61
'
62
63
test_expect_success 'reset --keep is ok when switching back' '
64
- git reset --keep second &&
65
- grep 4 file1 &&
66
- grep 4 file2 &&
67
- test "$(git rev-parse HEAD)" = "$(git rev-parse second)" &&
68
- test -z "$(git diff --cached)"
64
+ git reset --keep second &&
65
+ grep 4 file1 &&
66
+ grep 4 file2 &&
67
+ test "$(git rev-parse HEAD)" = "$(git rev-parse second)" &&
68
+ test -z "$(git diff --cached)"
69
'
70
71
# The next test will test the following:
@@ -75,28 +75,28 @@ test_expect_success 'reset --keep is ok when switching back' '
75
# file1: B B C D --merge D D D
76
# file2: C D D D --merge C D D
77
test_expect_success 'reset --merge discards changes added to index (1)' '
78
- git reset --hard second &&
79
- cat file1 >file2 &&
80
- echo "line 5" >> file1 &&
81
- git add file1 &&
82
- git reset --merge HEAD^ &&
83
- ! grep 4 file1 &&
84
- ! grep 5 file1 &&
85
- grep 4 file2 &&
86
- test "$(git rev-parse HEAD)" = "$(git rev-parse initial)" &&
87
- test -z "$(git diff --cached)"
78
+ git reset --hard second &&
79
+ cat file1 >file2 &&
80
+ echo "line 5" >> file1 &&
81
+ git add file1 &&
82
+ git reset --merge HEAD^ &&
83
+ ! grep 4 file1 &&
84
+ ! grep 5 file1 &&
85
+ grep 4 file2 &&
86
+ test "$(git rev-parse HEAD)" = "$(git rev-parse initial)" &&
87
+ test -z "$(git diff --cached)"
88
'
89
90
test_expect_success 'reset --merge is ok again when switching back (1)' '
91
- git reset --hard initial &&
92
- echo "line 5" >> file2 &&
93
- git add file2 &&
94
- git reset --merge second &&
95
- ! grep 4 file2 &&
96
- ! grep 5 file1 &&
97
- grep 4 file1 &&
98
- test "$(git rev-parse HEAD)" = "$(git rev-parse second)" &&
99
- test -z "$(git diff --cached)"
91
+ git reset --hard initial &&
92
+ echo "line 5" >> file2 &&
93
+ git add file2 &&
94
+ git reset --merge second &&
95
+ ! grep 4 file2 &&
96
+ ! grep 5 file1 &&
97
+ grep 4 file1 &&
98
+ test "$(git rev-parse HEAD)" = "$(git rev-parse second)" &&
99
+ test -z "$(git diff --cached)"
100
'
101
102
# The next test will test the following:
@@ -105,10 +105,10 @@ test_expect_success 'reset --merge is ok again when switching back (1)' '
105
# ----------------------------------------------------
106
# file1: B B C D --keep (disallowed)
107
test_expect_success 'reset --keep fails with changes in index in files it touches' '
108
- git reset --hard second &&
109
- echo "line 5" >> file1 &&
110
- git add file1 &&
111
- test_must_fail git reset --keep HEAD^
108
+ git reset --hard second &&
109
+ echo "line 5" >> file1 &&
110
+ git add file1 &&
111
+ test_must_fail git reset --keep HEAD^
112
'
113
114
# The next test will test the following:
@@ -118,23 +118,23 @@ test_expect_success 'reset --keep fails with changes in index in files it touche
118
# file1: C C C D --merge D D D
119
# file2: C C D D --merge D D D
120
test_expect_success 'reset --merge discards changes added to index (2)' '
121
- git reset --hard second &&
122
- echo "line 4" >> file2 &&
123
- git add file2 &&
124
- git reset --merge HEAD^ &&
125
- ! grep 4 file2 &&
126
- test "$(git rev-parse HEAD)" = "$(git rev-parse initial)" &&
127
- test -z "$(git diff)" &&
128
- test -z "$(git diff --cached)"
121
+ git reset --hard second &&
122
+ echo "line 4" >> file2 &&
123
+ git add file2 &&
124
+ git reset --merge HEAD^ &&
125
+ ! grep 4 file2 &&
126
+ test "$(git rev-parse HEAD)" = "$(git rev-parse initial)" &&
127
+ test -z "$(git diff)" &&
128
+ test -z "$(git diff --cached)"
129
'
130
131
test_expect_success 'reset --merge is ok again when switching back (2)' '
132
- git reset --hard initial &&
133
- git reset --merge second &&
134
- ! grep 4 file2 &&
135
- grep 4 file1 &&
136
- test "$(git rev-parse HEAD)" = "$(git rev-parse second)" &&
137
- test -z "$(git diff --cached)"
132
+ git reset --hard initial &&
133
+ git reset --merge second &&
134
+ ! grep 4 file2 &&
135
+ grep 4 file1 &&
136
+ test "$(git rev-parse HEAD)" = "$(git rev-parse second)" &&
137
+ test -z "$(git diff --cached)"
138
'
139
140
# The next test will test the following:
@@ -144,21 +144,21 @@ test_expect_success 'reset --merge is ok again when switching back (2)' '
144
# file1: C C C D --keep D D D
145
# file2: C C D D --keep C D D
146
test_expect_success 'reset --keep keeps changes it does not touch' '
147
- git reset --hard second &&
148
- echo "line 4" >> file2 &&
149
- git add file2 &&
150
- git reset --keep HEAD^ &&
151
- grep 4 file2 &&
152
- test "$(git rev-parse HEAD)" = "$(git rev-parse initial)" &&
153
- test -z "$(git diff --cached)"
147
+ git reset --hard second &&
148
+ echo "line 4" >> file2 &&
149
+ git add file2 &&
150
+ git reset --keep HEAD^ &&
151
+ grep 4 file2 &&
152
+ test "$(git rev-parse HEAD)" = "$(git rev-parse initial)" &&
153
+ test -z "$(git diff --cached)"
154
'
155
156
test_expect_success 'reset --keep keeps changes when switching back' '
157
- git reset --keep second &&
158
- grep 4 file2 &&
159
- grep 4 file1 &&
160
- test "$(git rev-parse HEAD)" = "$(git rev-parse second)" &&
161
- test -z "$(git diff --cached)"
157
+ git reset --keep second &&
158
+ grep 4 file2 &&
159
+ grep 4 file1 &&
160
+ test "$(git rev-parse HEAD)" = "$(git rev-parse second)" &&
161
+ test -z "$(git diff --cached)"
162
'
163
164
# The next test will test the following:
@@ -167,14 +167,14 @@ test_expect_success 'reset --keep keeps changes when switching back' '
167
# ----------------------------------------------------
168
# file1: A B B C --merge (disallowed)
169
test_expect_success 'reset --merge fails with changes in file it touches' '
170
- git reset --hard second &&
171
- echo "line 5" >> file1 &&
172
- test_tick &&
173
- git commit -m "add line 5" file1 &&
174
- sed -e "s/line 1/changed line 1/" <file1 >file3 &&
175
- mv file3 file1 &&
176
- test_must_fail git reset --merge HEAD^ 2>err.log &&
177
- grep file1 err.log | grep "not uptodate"
170
+ git reset --hard second &&
171
+ echo "line 5" >> file1 &&
172
+ test_tick &&
173
+ git commit -m "add line 5" file1 &&
174
+ sed -e "s/line 1/changed line 1/" <file1 >file3 &&
175
+ mv file3 file1 &&
176
+ test_must_fail git reset --merge HEAD^ 2>err.log &&
177
+ grep file1 err.log | grep "not uptodate"
178
'
179
180
# The next test will test the following:
@@ -183,36 +183,36 @@ test_expect_success 'reset --merge fails with changes in file it touches' '
183
# ----------------------------------------------------
184
# file1: A B B C --keep (disallowed)
185
test_expect_success 'reset --keep fails with changes in file it touches' '
186
- git reset --hard second &&
187
- echo "line 5" >> file1 &&
188
- test_tick &&
189
- git commit -m "add line 5" file1 &&
190
- sed -e "s/line 1/changed line 1/" <file1 >file3 &&
191
- mv file3 file1 &&
192
- test_must_fail git reset --keep HEAD^ 2>err.log &&
193
- grep file1 err.log | grep "not uptodate"
186
+ git reset --hard second &&
187
+ echo "line 5" >> file1 &&
188
+ test_tick &&
189
+ git commit -m "add line 5" file1 &&
190
+ sed -e "s/line 1/changed line 1/" <file1 >file3 &&
191
+ mv file3 file1 &&
192
+ test_must_fail git reset --keep HEAD^ 2>err.log &&
193
+ grep file1 err.log | grep "not uptodate"
194
'
195
196
test_expect_success 'setup 3 different branches' '
197
- git reset --hard second &&
198
- git branch branch1 &&
199
- git branch branch2 &&
200
- git branch branch3 &&
201
- git checkout branch1 &&
202
- echo "line 5 in branch1" >> file1 &&
203
- test_tick &&
204
- git commit -a -m "change in branch1" &&
205
- git checkout branch2 &&
206
- echo "line 5 in branch2" >> file1 &&
207
- test_tick &&
208
- git commit -a -m "change in branch2" &&
209
- git tag third &&
210
- git checkout branch3 &&
211
- echo a new file >file3 &&
212
- rm -f file1 &&
213
- git add file3 &&
214
- test_tick &&
215
- git commit -a -m "change in branch3"
197
+ git reset --hard second &&
198
+ git branch branch1 &&
199
+ git branch branch2 &&
200
+ git branch branch3 &&
201
+ git checkout branch1 &&
202
+ echo "line 5 in branch1" >> file1 &&
203
+ test_tick &&
204
+ git commit -a -m "change in branch1" &&
205
+ git checkout branch2 &&
206
+ echo "line 5 in branch2" >> file1 &&
207
+ test_tick &&
208
+ git commit -a -m "change in branch2" &&
209
+ git tag third &&
210
+ git checkout branch3 &&
211
+ echo a new file >file3 &&
212
+ rm -f file1 &&
213
+ git add file3 &&
214
+ test_tick &&
215
+ git commit -a -m "change in branch3"
216
'
217
218
# The next test will test the following:
@@ -221,12 +221,12 @@ test_expect_success 'setup 3 different branches' '
221
# ----------------------------------------------------
222
# file1: X U B C --merge C C C
223
test_expect_success '"reset --merge HEAD^" is ok with pending merge' '
224
- git checkout third &&
225
- test_must_fail git merge branch1 &&
226
- git reset --merge HEAD^ &&
227
- test "$(git rev-parse HEAD)" = "$(git rev-parse second)" &&
228
- test -z "$(git diff --cached)" &&
229
- test -z "$(git diff)"
224
+ git checkout third &&
225
+ test_must_fail git merge branch1 &&
226
+ git reset --merge HEAD^ &&
227
+ test "$(git rev-parse HEAD)" = "$(git rev-parse second)" &&
228
+ test -z "$(git diff --cached)" &&
229
+ test -z "$(git diff)"
230
'
231
232
# The next test will test the following:
@@ -235,10 +235,10 @@ test_expect_success '"reset --merge HEAD^" is ok with pending merge' '
235
# ----------------------------------------------------
236
# file1: X U B C --keep (disallowed)
237
test_expect_success '"reset --keep HEAD^" fails with pending merge' '
238
- git reset --hard third &&
239
- test_must_fail git merge branch1 &&
240
- test_must_fail git reset --keep HEAD^ 2>err.log &&
241
- test_i18ngrep "middle of a merge" err.log
238
+ git reset --hard third &&
239
+ test_must_fail git merge branch1 &&
240
+ test_must_fail git reset --keep HEAD^ 2>err.log &&
241
+ test_i18ngrep "middle of a merge" err.log
242
'
243
244
# The next test will test the following:
@@ -247,12 +247,12 @@ test_expect_success '"reset --keep HEAD^" fails with pending merge' '
247
# ----------------------------------------------------
248
# file1: X U B B --merge B B B
249
test_expect_success '"reset --merge HEAD" is ok with pending merge' '
250
- git reset --hard third &&
251
- test_must_fail git merge branch1 &&
252
- git reset --merge HEAD &&
253
- test "$(git rev-parse HEAD)" = "$(git rev-parse third)" &&
254
- test -z "$(git diff --cached)" &&
255
- test -z "$(git diff)"
250
+ git reset --hard third &&
251
+ test_must_fail git merge branch1 &&
252
+ git reset --merge HEAD &&
253
+ test "$(git rev-parse HEAD)" = "$(git rev-parse third)" &&
254
+ test -z "$(git diff --cached)" &&
255
+ test -z "$(git diff)"
256
'
257
258
# The next test will test the following:
@@ -261,36 +261,36 @@ test_expect_success '"reset --merge HEAD" is ok with pending merge' '
261
# ----------------------------------------------------
262
# file1: X U B B --keep (disallowed)
263
test_expect_success '"reset --keep HEAD" fails with pending merge' '
264
- git reset --hard third &&
265
- test_must_fail git merge branch1 &&
266
- test_must_fail git reset --keep HEAD 2>err.log &&
267
- test_i18ngrep "middle of a merge" err.log
264
+ git reset --hard third &&
265
+ test_must_fail git merge branch1 &&
266
+ test_must_fail git reset --keep HEAD 2>err.log &&
267
+ test_i18ngrep "middle of a merge" err.log
268
'
269
270
test_expect_success '--merge is ok with added/deleted merge' '
271
- git reset --hard third &&
272
- rm -f file2 &&
273
- test_must_fail git merge branch3 &&
274
- ! test -f file2 &&
275
- test -f file3 &&
276
- git diff --exit-code file3 &&
277
- git diff --exit-code branch3 file3 &&
278
- git reset --merge HEAD &&
279
- ! test -f file3 &&
280
- ! test -f file2 &&
281
- git diff --exit-code --cached
271
+ git reset --hard third &&
272
+ rm -f file2 &&
273
+ test_must_fail git merge branch3 &&
274
+ ! test -f file2 &&
275
+ test -f file3 &&
276
+ git diff --exit-code file3 &&
277
+ git diff --exit-code branch3 file3 &&
278
+ git reset --merge HEAD &&
279
+ ! test -f file3 &&
280
+ ! test -f file2 &&
281
+ git diff --exit-code --cached
282
'
283
284
test_expect_success '--keep fails with added/deleted merge' '
285
- git reset --hard third &&
286
- rm -f file2 &&
287
- test_must_fail git merge branch3 &&
288
- ! test -f file2 &&
289
- test -f file3 &&
290
- git diff --exit-code file3 &&
291
- git diff --exit-code branch3 file3 &&
292
- test_must_fail git reset --keep HEAD 2>err.log &&
293
- test_i18ngrep "middle of a merge" err.log
285
+ git reset --hard third &&
286
+ rm -f file2 &&
287
+ test_must_fail git merge branch3 &&
288
+ ! test -f file2 &&
289
+ test -f file3 &&
290
+ git diff --exit-code file3 &&
291
+ git diff --exit-code branch3 file3 &&
292
+ test_must_fail git reset --keep HEAD 2>err.log &&
293
+ test_i18ngrep "middle of a merge" err.log
294
'
295
296
test_done