t7600 (merge): do not launch gitk for --debug
Probably as a development aid, this test script runs gitk --all to allow the driver to inspect history between tests when run with --debug. As a result, running all tests with --debug requires closing a long series of gitk displays, one at a time. Use git log --graph --oneline instead. This way, the history is available for viewing with "git show" but the test script finishes without interaction. Longer term, it would be nice to have an option to run a user-specified command between tests. This patch does not do that. Cc: Lars Hjemli <hjemli@gmail.com> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jonathan Nieder committed
Aug 17, 2010 at 01:54 UTC
df516fb55891ae57676515d437d0e2cb3c8ad429
1 file changed
+29
-29
t/t7600-merge.sh
+29
-29
@@ -133,7 +133,7 @@ test_expect_success 'setup' '
133
create_merge_msgs
134
'
135
136
-test_debug 'gitk --all'
136
+test_debug 'git log --graph --decorate --oneline --all'
137
138
test_expect_success 'test option parsing' '
139
test_must_fail git merge -$ c1 &&
@@ -155,7 +155,7 @@ test_expect_success 'merge c0 with c1' '
155
verify_head "$c1"
156
'
157
158
-test_debug 'gitk --all'
158
+test_debug 'git log --graph --decorate --oneline --all'
159
160
test_expect_success 'merge c0 with c1 with --ff-only' '
161
git reset --hard c0 &&
@@ -165,7 +165,7 @@ test_expect_success 'merge c0 with c1 with --ff-only' '
165
verify_head "$c1"
166
'
167
168
-test_debug 'gitk --all'
168
+test_debug 'git log --graph --decorate --oneline --all'
169
170
test_expect_success 'merge c1 with c2' '
171
git reset --hard c1 &&
@@ -175,7 +175,7 @@ test_expect_success 'merge c1 with c2' '
175
verify_parents $c1 $c2
176
'
177
178
-test_debug 'gitk --all'
178
+test_debug 'git log --graph --decorate --oneline --all'
179
180
test_expect_success 'merge c1 with c2 and c3' '
181
git reset --hard c1 &&
@@ -185,7 +185,7 @@ test_expect_success 'merge c1 with c2 and c3' '
185
verify_parents $c1 $c2 $c3
186
'
187
188
-test_debug 'gitk --all'
188
+test_debug 'git log --graph --decorate --oneline --all'
189
190
test_expect_success 'failing merges with --ff-only' '
191
git reset --hard c1 &&
@@ -202,7 +202,7 @@ test_expect_success 'merge c0 with c1 (no-commit)' '
202
verify_head $c1
203
'
204
205
-test_debug 'gitk --all'
205
+test_debug 'git log --graph --decorate --oneline --all'
206
207
test_expect_success 'merge c1 with c2 (no-commit)' '
208
git reset --hard c1 &&
@@ -212,7 +212,7 @@ test_expect_success 'merge c1 with c2 (no-commit)' '
212
verify_mergeheads $c2
213
'
214
215
-test_debug 'gitk --all'
215
+test_debug 'git log --graph --decorate --oneline --all'
216
217
test_expect_success 'merge c1 with c2 and c3 (no-commit)' '
218
git reset --hard c1 &&
@@ -222,7 +222,7 @@ test_expect_success 'merge c1 with c2 and c3 (no-commit)' '
222
verify_mergeheads $c2 $c3
223
'
224
225
-test_debug 'gitk --all'
225
+test_debug 'git log --graph --decorate --oneline --all'
226
227
test_expect_success 'merge c0 with c1 (squash)' '
228
git reset --hard c0 &&
@@ -233,7 +233,7 @@ test_expect_success 'merge c0 with c1 (squash)' '
233
test_cmp squash.1 .git/SQUASH_MSG
234
'
235
236
-test_debug 'gitk --all'
236
+test_debug 'git log --graph --decorate --oneline --all'
237
238
test_expect_success 'merge c0 with c1 (squash, ff-only)' '
239
git reset --hard c0 &&
@@ -244,7 +244,7 @@ test_expect_success 'merge c0 with c1 (squash, ff-only)' '
244
test_cmp squash.1 .git/SQUASH_MSG
245
'
246
247
-test_debug 'gitk --all'
247
+test_debug 'git log --graph --decorate --oneline --all'
248
249
test_expect_success 'merge c1 with c2 (squash)' '
250
git reset --hard c1 &&
@@ -255,14 +255,14 @@ test_expect_success 'merge c1 with c2 (squash)' '
255
test_cmp squash.1-5 .git/SQUASH_MSG
256
'
257
258
-test_debug 'gitk --all'
258
+test_debug 'git log --graph --decorate --oneline --all'
259
260
test_expect_success 'unsuccesful merge of c1 with c2 (squash, ff-only)' '
261
git reset --hard c1 &&
262
test_must_fail git merge --squash --ff-only c2
263
'
264
265
-test_debug 'gitk --all'
265
+test_debug 'git log --graph --decorate --oneline --all'
266
267
test_expect_success 'merge c1 with c2 and c3 (squash)' '
268
git reset --hard c1 &&
@@ -273,7 +273,7 @@ test_expect_success 'merge c1 with c2 and c3 (squash)' '
273
test_cmp squash.1-5-9 .git/SQUASH_MSG
274
'
275
276
-test_debug 'gitk --all'
276
+test_debug 'git log --graph --decorate --oneline --all'
277
278
test_expect_success 'merge c1 with c2 (no-commit in config)' '
279
git reset --hard c1 &&
@@ -284,7 +284,7 @@ test_expect_success 'merge c1 with c2 (no-commit in config)' '
284
verify_mergeheads $c2
285
'
286
287
-test_debug 'gitk --all'
287
+test_debug 'git log --graph --decorate --oneline --all'
288
289
test_expect_success 'merge c1 with c2 (squash in config)' '
290
git reset --hard c1 &&
@@ -296,7 +296,7 @@ test_expect_success 'merge c1 with c2 (squash in config)' '
296
test_cmp squash.1-5 .git/SQUASH_MSG
297
'
298
299
-test_debug 'gitk --all'
299
+test_debug 'git log --graph --decorate --oneline --all'
300
301
test_expect_success 'override config option -n with --summary' '
302
git reset --hard c1 &&
@@ -326,7 +326,7 @@ test_expect_success 'override config option -n with --stat' '
326
fi
327
'
328
329
-test_debug 'gitk --all'
329
+test_debug 'git log --graph --decorate --oneline --all'
330
331
test_expect_success 'override config option --stat' '
332
git reset --hard c1 &&
@@ -342,7 +342,7 @@ test_expect_success 'override config option --stat' '
342
fi
343
'
344
345
-test_debug 'gitk --all'
345
+test_debug 'git log --graph --decorate --oneline --all'
346
347
test_expect_success 'merge c1 with c2 (override --no-commit)' '
348
git reset --hard c1 &&
@@ -353,7 +353,7 @@ test_expect_success 'merge c1 with c2 (override --no-commit)' '
353
verify_parents $c1 $c2
354
'
355
356
-test_debug 'gitk --all'
356
+test_debug 'git log --graph --decorate --oneline --all'
357
358
test_expect_success 'merge c1 with c2 (override --squash)' '
359
git reset --hard c1 &&
@@ -364,7 +364,7 @@ test_expect_success 'merge c1 with c2 (override --squash)' '
364
verify_parents $c1 $c2
365
'
366
367
-test_debug 'gitk --all'
367
+test_debug 'git log --graph --decorate --oneline --all'
368
369
test_expect_success 'merge c0 with c1 (no-ff)' '
370
git reset --hard c0 &&
@@ -375,7 +375,7 @@ test_expect_success 'merge c0 with c1 (no-ff)' '
375
verify_parents $c0 $c1
376
'
377
378
-test_debug 'gitk --all'
378
+test_debug 'git log --graph --decorate --oneline --all'
379
380
test_expect_success 'combining --squash and --no-ff is refused' '
381
test_must_fail git merge --squash --no-ff c1 &&
@@ -412,7 +412,7 @@ test_expect_success 'merge log message' '
412
test_cmp msg.log msg.act
413
'
414
415
-test_debug 'gitk --all'
415
+test_debug 'git log --graph --decorate --oneline --all'
416
417
test_expect_success 'merge c1 with c0, c2, c0, and c1' '
418
git reset --hard c1 &&
@@ -423,7 +423,7 @@ test_expect_success 'merge c1 with c0, c2, c0, and c1' '
423
verify_parents $c1 $c2
424
'
425
426
-test_debug 'gitk --all'
426
+test_debug 'git log --graph --decorate --oneline --all'
427
428
test_expect_success 'merge c1 with c0, c2, c0, and c1' '
429
git reset --hard c1 &&
@@ -434,7 +434,7 @@ test_expect_success 'merge c1 with c0, c2, c0, and c1' '
434
verify_parents $c1 $c2
435
'
436
437
-test_debug 'gitk --all'
437
+test_debug 'git log --graph --decorate --oneline --all'
438
439
test_expect_success 'merge c1 with c1 and c2' '
440
git reset --hard c1 &&
@@ -445,7 +445,7 @@ test_expect_success 'merge c1 with c1 and c2' '
445
verify_parents $c1 $c2
446
'
447
448
-test_debug 'gitk --all'
448
+test_debug 'git log --graph --decorate --oneline --all'
449
450
test_expect_success 'merge fast-forward in a dirty tree' '
451
git reset --hard c0 &&
@@ -455,7 +455,7 @@ test_expect_success 'merge fast-forward in a dirty tree' '
455
git merge c2
456
'
457
458
-test_debug 'gitk --all'
458
+test_debug 'git log --graph --decorate --oneline --all'
459
460
test_expect_success 'in-index merge' '
461
git reset --hard c0 &&
@@ -464,7 +464,7 @@ test_expect_success 'in-index merge' '
464
verify_parents $c0 $c1
465
'
466
467
-test_debug 'gitk --all'
467
+test_debug 'git log --graph --decorate --oneline --all'
468
469
test_expect_success 'refresh the index before merging' '
470
git reset --hard c1 &&
@@ -504,7 +504,7 @@ test_expect_success 'merge early part of c2' '
504
test_cmp expected.tag actual.tag
505
'
506
507
-test_debug 'gitk --all'
507
+test_debug 'git log --graph --decorate --oneline --all'
508
509
test_expect_success 'merge --no-ff --no-commit && commit' '
510
git reset --hard c0 &&
@@ -513,13 +513,13 @@ test_expect_success 'merge --no-ff --no-commit && commit' '
513
verify_parents $c0 $c1
514
'
515
516
-test_debug 'gitk --all'
516
+test_debug 'git log --graph --decorate --oneline --all'
517
518
test_expect_success 'amending no-ff merge commit' '
519
EDITOR=: git commit --amend &&
520
verify_parents $c0 $c1
521
'
522
523
-test_debug 'gitk --all'
523
+test_debug 'git log --graph --decorate --oneline --all'
524
525
test_done