undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

t7800: simplify basic usage test

Browse Source 
Use "test_line_count" instead of "wc -l", use "git -C" instead of a
subshell, and use test_expect_code when calling difftool.  Ease
debugging by capturing output into temporary files.

Suggested-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
David Aguilar 2017-02-07 01:16:59 -08:00 committed by Junio C Hamano
parent d81345ce09
commit e66adcadfe
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
t/t7800-difftool.sh
View File

@ -24,16 +24,15 @@ prompt_given ()
}
test_expect_success 'basic usage requires no repo' '
lines=$(git difftool -h | grep ^usage: | wc -l) &&
test "$lines" -eq 1 &&
test_expect_code 129 git difftool -h >output &&
grep ^usage: output &&
# create a ceiling directory to prevent Git from finding a repo
mkdir -p not/repo &&
ceiling="$PWD/not" &&
lines=$(cd not/repo &&
GIT_CEILING_DIRECTORIES="$ceiling" git difftool -h |
grep ^usage: | wc -l) &&
test "$lines" -eq 1 &&
rmdir -p not/repo
test_when_finished rm -r not &&
test_expect_code 129 \
env GIT_CEILING_DIRECTORIES="$(pwd)/not" \
git -C not/repo difftool -h >output &&
grep ^usage: output
'
# Create a file on master and change it on branch