[PATCH 1/3] t5000: extract nongit function to test-lib-functions.sh
- From
Jeff King <peff@peff.net>
- Date
- Dec 16, 2016, 02:30 UTC
- Message-ID
- <20161216023011.7k4wyekid3zitl56@sigill.intra.peff.net>
- In-Reply-To
- <20161216022904.cjang6napnl2vkc6@sigill.intra.peff.net>
This function abstracts the idea of running a command outside of any repository (which is slightly awkward to do because even if you make a non-repo directory, git may keep walking up outside of the trash directory). There are several scripts that use the same technique, so let's make the function available for everyone.
Signed-off-by: Jeff King <peff@peff.net> --- I waffled on the name. Something like test_outside_repo() is more descriptive, but as this is prepended to existing commands, the lines already end up quite long.
t/t5000-tar-tree.sh | 14 -------------- t/test-lib-functions.sh | 14 ++++++++++++++ 2 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/t/t5000-tar-tree.sh b/t/t5000-tar-tree.sh index 830bf2a2f6..886b6953e4 100755 --- a/t/t5000-tar-tree.sh +++ b/t/t5000-tar-tree.sh @@ -94,20 +94,6 @@ check_tar() { ' } -# run "$@" inside a non-git directory -nongit () { - test -d non-repo || - mkdir non-repo || - return 1 - - ( - GIT_CEILING_DIRECTORIES=$(pwd) && - export GIT_CEILING_DIRECTORIES && - cd non-repo && - "$@" - ) -} - test_expect_success \ 'populate workdir' \ 'mkdir a && diff --git a/t/test-lib-functions.sh b/t/test-lib-functions.sh index fdaeb3a96b..adab7f51f4 100644 --- a/t/test-lib-functions.sh +++ b/t/test-lib-functions.sh @@ -994,3 +994,17 @@ test_copy_bytes () { } ' - "$1" } + +# run "$@" inside a non-git directory +nongit () { + test -d non-repo || + mkdir non-repo || + return 1 + + ( + GIT_CEILING_DIRECTORIES=$(pwd) && + export GIT_CEILING_DIRECTORIES && + cd non-repo && + "$@" + ) +}
-- 2.11.0.348.g960a0b554