summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2016-12-16 02:30:12 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-12-16 17:29:16 (GMT)
commitde95302a4c0c6c733fb734b5a3d3d54dd54ec674 (patch)
treede17f1d510101f0e473bd89618fef0a818c76647
parent454cb6bd52a4de614a3633e4f547af03d5c3b640 (diff)
downloadgit-de95302a4c0c6c733fb734b5a3d3d54dd54ec674.zip
git-de95302a4c0c6c733fb734b5a3d3d54dd54ec674.tar.gz
git-de95302a4c0c6c733fb734b5a3d3d54dd54ec674.tar.bz2
t5000: extract nongit function to test-lib-functions.sh
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> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rwxr-xr-xt/t5000-tar-tree.sh14
-rw-r--r--t/test-lib-functions.sh14
2 files changed, 14 insertions, 14 deletions
diff --git a/t/t5000-tar-tree.sh b/t/t5000-tar-tree.sh
index 830bf2a..886b695 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 fdaeb3a..adab7f5 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 &&
+ "$@"
+ )
+}