summaryrefslogtreecommitdiff
path: root/t/t1308-config-set.sh
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2016-12-16 02:31:59 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-12-16 17:31:00 (GMT)
commita3c45d126012e01b23edc4923ffddffac61d703b (patch)
tree6d8d44acd205a6de811a2fba528e72d3a289f8e1 /t/t1308-config-set.sh
parent7176a31444ce5ed683dbd75d2e1e2f89018d0100 (diff)
downloadgit-a3c45d126012e01b23edc4923ffddffac61d703b.zip
git-a3c45d126012e01b23edc4923ffddffac61d703b.tar.gz
git-a3c45d126012e01b23edc4923ffddffac61d703b.tar.bz2
t: use nongit() function where applicable
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>
Diffstat (limited to 't/t1308-config-set.sh')
-rwxr-xr-xt/t1308-config-set.sh10
1 files changed, 2 insertions, 8 deletions
diff --git a/t/t1308-config-set.sh b/t/t1308-config-set.sh
index 7655c94..ff50960 100755
--- a/t/t1308-config-set.sh
+++ b/t/t1308-config-set.sh
@@ -219,14 +219,8 @@ test_expect_success 'check line errors for malformed values' '
'
test_expect_success 'error on modifying repo config without repo' '
- mkdir no-repo &&
- (
- 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
- )
+ nongit test_must_fail git config a.b c 2>err &&
+ grep "not in a git directory" err
'
cmdline_config="'foo.bar=from-cmdline'"