Merge branch 'ds/commit-graph-tests'
authorJunio C Hamano <gitster@pobox.com>
Mon, 17 Sep 2018 20:53:58 +0000 (13:53 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 17 Sep 2018 20:53:58 +0000 (13:53 -0700)
We can now optionally run tests with commit-graph enabled.

* ds/commit-graph-tests:
commit-graph: define GIT_TEST_COMMIT_GRAPH

1  2 
builtin/commit.c
commit-graph.c
commit-graph.h
t/README
index fa3e53232d2d24564a2de6370b3bdef72a153735,37c0056a6eb0fad9afbe51c23f809a842b4636bb..b57d8e4b82052bdb85287b5fcb675261a68c639b
@@@ -33,7 -33,7 +33,8 @@@
  #include "sequencer.h"
  #include "mailmap.h"
  #include "help.h"
 +#include "commit-reach.h"
+ #include "commit-graph.h"
  
  static const char * const builtin_commit_usage[] = {
        N_("git commit [<options>] [--] <pathspec>..."),
diff --cc commit-graph.c
Simple merge
diff --cc commit-graph.h
Simple merge
diff --cc t/README
index 204b9f4cc5cbf8ad265423f6062cd99c24dd33d3,fed7a066ab03ce2999f0a734341685134b85b7fc..3ea6c854606056e1a7d9431dd59518d817768527
+++ b/t/README
@@@ -319,10 -319,10 +319,14 @@@ GIT_TEST_OE_DELTA_SIZE=<n> exercises th
  path where deltas larger than this limit require extra memory
  allocation for bookkeeping.
  
 +GIT_TEST_VALIDATE_INDEX_CACHE_ENTRIES=<boolean> checks that cache-tree
 +records are valid when the index is written out or after a merge. This
 +is mostly to catch missing invalidation. Default is true.
 +
+ GIT_TEST_COMMIT_GRAPH=<boolean>, when true, forces the commit-graph to
+ be written after every 'git commit' command, and overrides the
+ 'core.commitGraph' setting to true.
  Naming Tests
  ------------