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>

diff --git a/t/t7800-difftool.sh b/t/t7800-difftool.sh
index c6d6b1c99fe98b7dc692eaf3828a08696bfb5e10..e6a16cda79aba4794386b5f11fff61a429c9a3a2 100755 (executable)
--- a/t/t7800-difftool.sh
+++ b/t/t7800-difftool.sh
@@ -340,6 +340,21 @@ test_expect_success PERL 'difftool --dir-diff' '
        stdin_contains file <output
 '
 
        stdin_contains file <output
 '
 

+test_expect_success PERL 'difftool --dir-diff ignores --prompt' '
+       git difftool --dir-diff --prompt --extcmd ls branch >output &&
+       stdin_contains sub <output &&
+       stdin_contains file <output
+'
+
+test_expect_success PERL 'difftool --dir-diff from subdirectory' '
+       (
+               cd sub &&
+               git difftool --dir-diff --extcmd ls branch >output &&
+               stdin_contains sub <output &&
+               stdin_contains file <output
+       )
+'
+

 write_script .git/CHECK_SYMLINKS <<\EOF
 for f in file file2 sub/sub
 do
 write_script .git/CHECK_SYMLINKS <<\EOF
 for f in file file2 sub/sub
 do


@@ -362,19 +377,4 @@ test_expect_success PERL,SYMLINKS 'difftool --dir-diff --symlink without unstage
        test_cmp actual expect
 '
 
        test_cmp actual expect
 '
 

-test_expect_success PERL 'difftool --dir-diff ignores --prompt' '
-       git difftool --dir-diff --prompt --extcmd ls branch >output &&
-       stdin_contains sub <output &&
-       stdin_contains file <output
-'
-
-test_expect_success PERL 'difftool --dir-diff from subdirectory' '
-       (
-               cd sub &&
-               git difftool --dir-diff --extcmd ls branch >output &&
-               stdin_contains sub <output &&
-               stdin_contains file <output
-       )
-'
-

 test_done
 test_done