summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2016-09-12 20:24:10 -0700
committerJunio C Hamano <gitster@pobox.com>2016-09-13 15:45:45 -0700
commit25a6c2804675a08dca648201e5bd590a787eab74 (patch)
tree5d2edf231cff2671320e90c563f35eb5f94f6d20
parent11ca4bec96e00f7ed18dbd2a475a8d568f4b85f3 (diff)
downloadgit-25a6c2804675a08dca648201e5bd590a787eab74.tar.gz
test-config: setup git directory
The t1308 test script uses our test-config helper to read repository-level config, but never actually sets up the repository. This works because git_config() blindly reads ".git/config" even if we have not configured a repository. This means that test-config won't work from a subdirectory, though since it's just a helper for the test scripts, that's not a big deal. More important is that the behavior of git_config() is going to change, and we want to make sure that t1308 continues to work. We can just use setup_git_directory(), and not the gentle form; there's no point in being flexible, as it's just a helper for the tests. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--test-config.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/test-config.c b/test-config.c
index 6a77552210..7ee3210da3 100644
--- a/test-config.c
+++ b/test-config.c
@@ -39,6 +39,9 @@ int main(int argc, char **argv)
const char *v;
const struct string_list *strptr;
struct config_set cs;
+
+ setup_git_directory();
+
git_configset_init(&cs);
if (argc < 2) {