Merge branch 'ds/feature-macros'

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

diff --cc Makefile
Simple merge

diff --cc builtin/gc.c
index 305fb0f45af3bdfc32e15bcc18acdcaa6af205cb,4b8fbb9965c88ae44f88e62aa30e5737d95b1cc8..a22b6ff683465a3addeb059c89775e080197f155
--- 1/builtin/gc.c
--- 2/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; "

diff --cc builtin/pack-objects.c
Simple merge

diff --cc commit-graph.c
Simple merge

diff --cc config.c
Simple merge

diff --cc read-cache.c
Simple merge

diff --cc t/t0410-partial-clone.sh
Simple merge

diff --cc t/t5324-split-commit-graph.sh
Simple merge