diff options
| author | John Keeping <john@keeping.me.uk> | 2013-03-29 11:28:32 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-03-29 12:38:41 -0700 |
| commit | bf341b902ea1346373886f4eb4352a06b7b4cdfd (patch) | |
| tree | 41ff8e8e81c5e3afd80dafff96de66e00bb8eb9f /t/t7800-difftool.sh | |
| parent | 631bc94e67383b66da190550866566f09d32f299 (diff) | |
| download | git-bf341b902ea1346373886f4eb4352a06b7b4cdfd.tar.gz | |
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>
Diffstat (limited to 't/t7800-difftool.sh')
| -rwxr-xr-x | t/t7800-difftool.sh | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/t/t7800-difftool.sh b/t/t7800-difftool.sh index c6d6b1c99f..e6a16cda79 100755 --- 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 ' +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 @@ -362,19 +377,4 @@ test_expect_success PERL,SYMLINKS 'difftool --dir-diff --symlink without unstage 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 |