From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 23 Aug 2019 21:33:46 +0000 (-0700)
Subject: Merge branch 'ds/feature-macros' into next
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=115f0c8df9bf638d9d387c21f795e10fa8db396d;p=git

Merge branch 'ds/feature-macros' into next

A mechanism to affect the default setting for a (related) group of
configuration variables is introduced.

* ds/feature-macros:
  repo-settings: create feature.experimental setting
  repo-settings: create feature.manyFiles setting
  repo-settings: parse core.untrackedCache
  commit-graph: turn on commit-graph by default
  t6501: use 'git gc' in quiet mode
  repo-settings: consolidate some config settings
---

115f0c8df9bf638d9d387c21f795e10fa8db396d
diff --cc builtin/gc.c
index 305fb0f45a,4b8fbb9965..a22b6ff683
--- a/builtin/gc.c
+++ b/builtin/gc.c
@@@ -685,11 -683,11 +683,11 @@@ int cmd_gc(int argc, const char **argv
  		clean_pack_garbage();
  	}
  
- 	if (gc_write_commit_graph &&
- 	    write_commit_graph_reachable(get_object_directory(),
- 					 !quiet && !daemonized ? COMMIT_GRAPH_WRITE_PROGRESS : 0,
- 					 NULL))
- 		return 1;
+ 	prepare_repo_settings(the_repository);
+ 	if (the_repository->settings.gc_write_commit_graph == 1)
+ 		write_commit_graph_reachable(get_object_directory(),
 -					     !quiet && !daemonized ? COMMIT_GRAPH_PROGRESS : 0,
++					     !quiet && !daemonized ? COMMIT_GRAPH_WRITE_PROGRESS : 0,
+ 					     NULL);
  
  	if (auto_gc && too_many_loose_objects())
  		warning(_("There are too many unreachable loose objects; "