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

t: use nongit() function where applicable

Browse Source 
Many tests want to run a command outside of any git repo;
with the nongit() function this is now a one-liner. It saves
a few lines, but more importantly, it's immediately obvious
what the code is trying to accomplish.

This doesn't convert every such case in the test suite; it
just covers those that want to do a one-off command. Other
cases, such as the ones in t4035, are part of a larger
scheme of outside-repo files, and it's less confusing for
them to stay consistent with the surrounding tests.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jeff King 2016-12-15 21:31:59 -05:00 committed by Junio C Hamano
parent 7176a31444
commit a3c45d1260
3 changed files with 5 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
t/t1308-config-set.sh
View File

@ -219,14 +219,8 @@ test_expect_success 'check line errors for malformed values' '
' '
test_expect_success 'error on modifying repo config without repo' ' test_expect_success 'error on modifying repo config without repo' '
mkdir no-repo && nongit test_must_fail git config a.b c 2>err &&
( grep "not in a git directory" err
GIT_CEILING_DIRECTORIES=$(pwd) &&
export GIT_CEILING_DIRECTORIES &&
cd no-repo &&
test_must_fail git config a.b c 2>err &&
grep "not in a git directory" err
)
' '
cmdline_config="'foo.bar=from-cmdline'" cmdline_config="'foo.bar=from-cmdline'"

17
t/t9100-git-svn-basic.sh
View File

@ -17,25 +17,12 @@ case "$GIT_SVN_LC_ALL" in
;; ;;
esac esac
deepdir=nothing-above
ceiling=$PWD
test_expect_success 'git svn --version works anywhere' ' test_expect_success 'git svn --version works anywhere' '
mkdir -p "$deepdir" && ( nongit git svn --version
GIT_CEILING_DIRECTORIES="$ceiling" &&
export GIT_CEILING_DIRECTORIES &&
cd "$deepdir" &&
git svn --version
)
' '
test_expect_success 'git svn help works anywhere' ' test_expect_success 'git svn help works anywhere' '
mkdir -p "$deepdir" && ( nongit git svn help
GIT_CEILING_DIRECTORIES="$ceiling" &&
export GIT_CEILING_DIRECTORIES &&
cd "$deepdir" &&
git svn help
)
' '
test_expect_success \ test_expect_success \

7
t/t9902-completion.sh
View File

@ -257,12 +257,7 @@ test_expect_success SYMLINKS '__gitdir - resulting path avoids symlinks' '
' '
test_expect_success '__gitdir - not a git repository' ' test_expect_success '__gitdir - not a git repository' '
( nongit test_must_fail __gitdir
cd subdir/subsubdir &&
GIT_CEILING_DIRECTORIES="$TRASH_DIRECTORY" &&
export GIT_CEILING_DIRECTORIES &&
test_must_fail __gitdir
)
' '
test_expect_success '__gitcomp - trailing space - options' ' test_expect_success '__gitcomp - trailing space - options' '