summaryrefslogtreecommitdiff
path: root/t/t1305-config-include.sh
diff options
context:
space:
mode:
authorNguyễn Thái Ngọc Duy <pclouds@gmail.com>2018-03-24 07:44:34 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-03-27 15:45:47 (GMT)
commit0e2678af4c90f0cb28d04cb87f2a71ea2ec47f5d (patch)
tree7e949ddcd220e5e67a3ce72254b7fbba0970ab87 /t/t1305-config-include.sh
parent64eb82fea8fbfe96e02997921283f6ffa368f5fe (diff)
downloadgit-0e2678af4c90f0cb28d04cb87f2a71ea2ec47f5d.zip
git-0e2678af4c90f0cb28d04cb87f2a71ea2ec47f5d.tar.gz
git-0e2678af4c90f0cb28d04cb87f2a71ea2ec47f5d.tar.bz2
t/helper: merge test-config into test-tool
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t1305-config-include.sh')
-rwxr-xr-xt/t1305-config-include.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t1305-config-include.sh b/t/t1305-config-include.sh
index d9d2f54..f035ee4 100755
--- a/t/t1305-config-include.sh
+++ b/t/t1305-config-include.sh
@@ -224,7 +224,7 @@ test_expect_success 'conditional include, early config reading' '
echo "[includeIf \"gitdir:foo/\"]path=bar6" >>.git/config &&
echo "[test]six=6" >.git/bar6 &&
echo 6 >expect &&
- test-config read_early_config test.six >actual &&
+ test-tool config read_early_config test.six >actual &&
test_cmp expect actual
)
'