diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2018-03-24 07:44:46 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-03-27 15:45:47 (GMT) |
| commit | 34889d3cd7e431597a6a93f26f14a81a61b7d603 (patch) | |
| tree | 7c64a71f54b12da2818d10243403b05ca8793cc2 /t/helper | |
| parent | 9080e75fbcaffaa5bb09b123b8f32719573d82f4 (diff) | |
| download | git-34889d3cd7e431597a6a93f26f14a81a61b7d603.zip git-34889d3cd7e431597a6a93f26f14a81a61b7d603.tar.gz git-34889d3cd7e431597a6a93f26f14a81a61b7d603.tar.bz2 | |
t/helper: merge (unused) test-mergesort 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/helper')
| -rw-r--r-- | t/helper/test-mergesort.c | 3 | ||||
| -rw-r--r-- | t/helper/test-tool.c | 1 | ||||
| -rw-r--r-- | t/helper/test-tool.h | 1 |
3 files changed, 4 insertions, 1 deletions
diff --git a/t/helper/test-mergesort.c b/t/helper/test-mergesort.c index 335cf6b..c5cffaa 100644 --- a/t/helper/test-mergesort.c +++ b/t/helper/test-mergesort.c @@ -1,3 +1,4 @@ +#include "test-tool.h" #include "cache.h" #include "mergesort.h" @@ -22,7 +23,7 @@ static int compare_strings(const void *a, const void *b) return strcmp(x->text, y->text); } -int cmd_main(int argc, const char **argv) +int cmd__mergesort(int argc, const char **argv) { struct line *line, *p = NULL, *lines = NULL; struct strbuf sb = STRBUF_INIT; diff --git a/t/helper/test-tool.c b/t/helper/test-tool.c index 16c7883..5d47015 100644 --- a/t/helper/test-tool.c +++ b/t/helper/test-tool.c @@ -21,6 +21,7 @@ static struct test_cmd cmds[] = { { "index-version", cmd__index_version }, { "lazy-init-name-hash", cmd__lazy_init_name_hash }, { "match-trees", cmd__match_trees }, + { "mergesort", cmd__mergesort }, { "sha1", cmd__sha1 }, }; diff --git a/t/helper/test-tool.h b/t/helper/test-tool.h index d2f009c..6c9437f 100644 --- a/t/helper/test-tool.h +++ b/t/helper/test-tool.h @@ -15,6 +15,7 @@ int cmd__hashmap(int argc, const char **argv); int cmd__index_version(int argc, const char **argv); int cmd__lazy_init_name_hash(int argc, const char **argv); int cmd__match_trees(int argc, const char **argv); +int cmd__mergesort(int argc, const char **argv); int cmd__sha1(int argc, const char **argv); #endif |