From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 30 Sep 2019 04:19:32 +0000 (+0900)
Subject: Merge branch 'ds/commit-graph-on-fetch'
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/5a5350940bd5407968b158c0059938fa5cc0860e

Merge branch 'ds/commit-graph-on-fetch'

A configuration variable tells "git fetch" to write the commit
graph after finishing.

* ds/commit-graph-on-fetch:
fetch: add fetch.writeCommitGraph config setting
---

5a5350940bd5407968b158c0059938fa5cc0860e
diff --cc builtin/fetch.c
index 9b27ae9681,d36a403859..67c0eb88c6
--- a/builtin/fetch.c
+++ b/builtin/fetch.c
@@@ -23,8 -23,7 +23,9 @@@
  #include "packfile.h"
  #include "list-objects-filter-options.h"
  #include "commit-reach.h"
 +#include "branch.h"
 +#include "promisor-remote.h"
+ #include "commit-graph.h"
  
  #define FORCED_UPDATES_DELAY_WARNING_IN_MS (10 * 1000)
  
@@@ -1759,6 -1716,20 +1760,20 @@@ int cmd_fetch(int argc, const char **ar
  
  	string_list_clear(&list, 0);
  
+ 	prepare_repo_settings(the_repository);
+ 	if (the_repository->settings.fetch_write_commit_graph) {
 -		int commit_graph_flags = COMMIT_GRAPH_SPLIT;
++		int commit_graph_flags = COMMIT_GRAPH_WRITE_SPLIT;
+ 		struct split_commit_graph_opts split_opts;
+ 		memset(&split_opts, 0, sizeof(struct split_commit_graph_opts));
+ 
+ 		if (progress)
 -			commit_graph_flags |= COMMIT_GRAPH_PROGRESS;
++			commit_graph_flags |= COMMIT_GRAPH_WRITE_PROGRESS;
+ 
+ 		write_commit_graph_reachable(get_object_directory(),
+ 					     commit_graph_flags,
+ 					     &split_opts);
+ 	}
+ 
  	close_object_store(the_repository->objects);
  
  	if (enable_auto_gc) {