mirror of
https://github.com/git/git
synced 2024-08-24 18:26:02 +00:00
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>
This commit is contained in:
parent
9080e75fbc
commit
34889d3cd7
2
Makefile
2
Makefile
|
@ -666,13 +666,13 @@ TEST_BUILTINS_OBJS += test-hashmap.o
|
|||
TEST_BUILTINS_OBJS += test-index-version.o
|
||||
TEST_BUILTINS_OBJS += test-lazy-init-name-hash.o
|
||||
TEST_BUILTINS_OBJS += test-match-trees.o
|
||||
TEST_BUILTINS_OBJS += test-mergesort.o
|
||||
TEST_BUILTINS_OBJS += test-sha1.o
|
||||
|
||||
TEST_PROGRAMS_NEED_X += test-dump-fsmonitor
|
||||
TEST_PROGRAMS_NEED_X += test-dump-untracked-cache
|
||||
TEST_PROGRAMS_NEED_X += test-fake-ssh
|
||||
TEST_PROGRAMS_NEED_X += test-line-buffer
|
||||
TEST_PROGRAMS_NEED_X += test-mergesort
|
||||
TEST_PROGRAMS_NEED_X += test-mktemp
|
||||
TEST_PROGRAMS_NEED_X += test-online-cpus
|
||||
TEST_PROGRAMS_NEED_X += test-parse-options
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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 },
|
||||
};
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue