From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 27 Aug 2018 21:33:43 +0000 (-0700)
Subject: Merge branch 'jk/use-compat-util-in-test-tool'
X-Git-Tag: v2.19.0-rc1~14
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/6d9276ea13f262f017af4a52fadac7ab7d0ea523?ds=inline;hp=-c

Merge branch 'jk/use-compat-util-in-test-tool'

Dev tool update.

* jk/use-compat-util-in-test-tool:
test-tool.h: include git-compat-util.h
---

6d9276ea13f262f017af4a52fadac7ab7d0ea523
diff --combined t/helper/test-tool.h
index e926c416ea,d1ac9fa4c7..e954e8c522
--- a/t/helper/test-tool.h
+++ b/t/helper/test-tool.h
@@@ -1,6 -1,8 +1,8 @@@
  #ifndef __TEST_TOOL_H__
  #define __TEST_TOOL_H__
  
+ #include "git-compat-util.h"
+ 
  int cmd__chmtime(int argc, const char **argv);
  int cmd__config(int argc, const char **argv);
  int cmd__ctype(int argc, const char **argv);
@@@ -13,7 -15,6 +15,7 @@@ int cmd__example_decorate(int argc, con
  int cmd__genrandom(int argc, const char **argv);
  int cmd__hashmap(int argc, const char **argv);
  int cmd__index_version(int argc, const char **argv);
 +int cmd__json_writer(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);
@@@ -24,7 -25,6 +26,7 @@@ int cmd__prio_queue(int argc, const cha
  int cmd__read_cache(int argc, const char **argv);
  int cmd__ref_store(int argc, const char **argv);
  int cmd__regex(int argc, const char **argv);
 +int cmd__repository(int argc, const char **argv);
  int cmd__revision_walking(int argc, const char **argv);
  int cmd__run_command(int argc, const char **argv);
  int cmd__scrap_cache_tree(int argc, const char **argv);