summaryrefslogtreecommitdiff
path: root/t/helper/test-config.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-04-11 13:09:56 +0900
committerJunio C Hamano <gitster@pobox.com>2018-04-11 13:09:56 +0900
commit27f25845cf5ebcfd214c16b9d9b53200980dfef8 (patch)
tree2262c73076e035bb96adc61e43221779ae3d5cbd /t/helper/test-config.c
parent3a1ec60c43b1cad73fed8040aed7117900e9fd9d (diff)
parentc81f843d0901c79150b1bf2fe528ad0c48267c24 (diff)
Merge branch 'nd/combined-test-helper'
Small test-helper programs have been consolidated into a single binary. * nd/combined-test-helper: (36 commits) t/helper: merge test-write-cache into test-tool t/helper: merge test-wildmatch into test-tool t/helper: merge test-urlmatch-normalization into test-tool t/helper: merge test-subprocess into test-tool t/helper: merge test-submodule-config into test-tool t/helper: merge test-string-list into test-tool t/helper: merge test-strcmp-offset into test-tool t/helper: merge test-sigchain into test-tool t/helper: merge test-sha1-array into test-tool t/helper: merge test-scrap-cache-tree into test-tool t/helper: merge test-run-command into test-tool t/helper: merge test-revision-walking into test-tool t/helper: merge test-regex into test-tool t/helper: merge test-ref-store into test-tool t/helper: merge test-read-cache into test-tool t/helper: merge test-prio-queue into test-tool t/helper: merge test-path-utils into test-tool t/helper: merge test-online-cpus into test-tool t/helper: merge test-mktemp into test-tool t/helper: merge (unused) test-mergesort into test-tool ...
Diffstat (limited to 't/helper/test-config.c')
-rw-r--r--t/helper/test-config.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/t/helper/test-config.c b/t/helper/test-config.c
index 1a7b8bd3d6..214003d5b2 100644
--- a/t/helper/test-config.c
+++ b/t/helper/test-config.c
@@ -1,3 +1,4 @@
+#include "test-tool.h"
#include "cache.h"
#include "config.h"
#include "string-list.h"
@@ -32,7 +33,7 @@
* Examples:
*
* To print the value with highest priority for key "foo.bAr Baz.rock":
- * test-config get_value "foo.bAr Baz.rock"
+ * test-tool config get_value "foo.bAr Baz.rock"
*
*/
@@ -77,7 +78,7 @@ static int early_config_cb(const char *var, const char *value, void *vdata)
return 0;
}
-int cmd_main(int argc, const char **argv)
+int cmd__config(int argc, const char **argv)
{
int i, val;
const char *v;