Re: [PATCH v2 02/10] merge: check config before loading commits

On 4/10/2018 10:12 PM, Junio C Hamano wrote: Derrick Stolee writes: diff --git a/builtin/merge.c b/builtin/merge.c index ee050a47f3..20897f8223 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -1183,13 +1183,14 @@ int cmd_merge(int argc, const char **argv, const

Re: [PATCH v2 02/10] merge: check config before loading commits

Derrick Stolee writes: > diff --git a/builtin/merge.c b/builtin/merge.c > index ee050a47f3..20897f8223 100644 > --- a/builtin/merge.c > +++ b/builtin/merge.c > @@ -1183,13 +1183,14 @@ int cmd_merge(int argc, const char **argv, const char > *prefix) > branch =

[PATCH v2 02/10] merge: check config before loading commits

In anticipation of using generation numbers from the commit-graph, we must ensure that all commits that exist in the commit-graph are loaded from that file instead of from the object database. Since the commit-graph file is only checked if core.commitGraph is true, we must check the default config