From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 17 Sep 2018 20:53:58 +0000 (-0700)
Subject: Merge branch 'ds/commit-graph-tests'
X-Git-Tag: v2.20.0-rc0~234
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=06880cff3892185ae71839636e2d2c688413eccb;p=thirdparty%2Fgit.git

Merge branch 'ds/commit-graph-tests'

We can now optionally run tests with commit-graph enabled.

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

06880cff3892185ae71839636e2d2c688413eccb
diff --cc builtin/commit.c
index fa3e53232d,37c0056a6e..b57d8e4b82
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@@ -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 t/README
index 204b9f4cc5,fed7a066ab..3ea6c85460
--- a/t/README
+++ 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
  ------------