t7800: move '--symlinks' specific test to the end
This will group the tests more logically when we introduce a helper to run most --dir-diff tests with both --symlinks and --no-symlinks. Signed-off-by: John Keeping <john@keeping.me.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com>
John Keeping committed
Mar 29, 2013 at 11:28 UTC
bf341b902ea1346373886f4eb4352a06b7b4cdfd
1 file changed
+15
-15
t/t7800-difftool.sh
+15
-15
@@ -340,6 +340,21 @@ test_expect_success PERL 'difftool --dir-diff' '
340
stdin_contains file <output
341
'
342
343
+test_expect_success PERL 'difftool --dir-diff ignores --prompt' '
344
+ git difftool --dir-diff --prompt --extcmd ls branch >output &&
345
+ stdin_contains sub <output &&
346
+ stdin_contains file <output
347
+'
348
+
349
+test_expect_success PERL 'difftool --dir-diff from subdirectory' '
350
+ (
351
+ cd sub &&
352
+ git difftool --dir-diff --extcmd ls branch >output &&
353
+ stdin_contains sub <output &&
354
+ stdin_contains file <output
355
+ )
356
+'
357
+
358
write_script .git/CHECK_SYMLINKS <<\EOF
359
for f in file file2 sub/sub
360
do
@@ -362,19 +377,4 @@ test_expect_success PERL,SYMLINKS 'difftool --dir-diff --symlink without unstage
377
test_cmp actual expect
378
'
379
365
-test_expect_success PERL 'difftool --dir-diff ignores --prompt' '
366
- git difftool --dir-diff --prompt --extcmd ls branch >output &&
367
- stdin_contains sub <output &&
368
- stdin_contains file <output
369
-'
370
-
371
-test_expect_success PERL 'difftool --dir-diff from subdirectory' '
372
- (
373
- cd sub &&
374
- git difftool --dir-diff --extcmd ls branch >output &&
375
- stdin_contains sub <output &&
376
- stdin_contains file <output
377
- )
378
-'
379
-
380
test_done