Re: [PATCH 04/19] merge-recursive: exit early if index != head

2019-07-25 Thread Elijah Newren
On Thu, Jul 25, 2019 at 12:51 PM Johannes Schindelin wrote: > > Hi Elijah, > > On Thu, 25 Jul 2019, Elijah Newren wrote: > > > We had a rule to enforce that the index matches head, but it was found > > at the beginning of merge_trees() and would only trigger when > > opt->call_depth was 0. Since

Re: [PATCH 04/19] merge-recursive: exit early if index != head

2019-07-25 Thread Johannes Schindelin
Hi Elijah, On Thu, 25 Jul 2019, Elijah Newren wrote: > We had a rule to enforce that the index matches head, but it was found > at the beginning of merge_trees() and would only trigger when > opt->call_depth was 0. Since merge_recursive() doesn't call > merge_trees() until after returning from r

[PATCH 04/19] merge-recursive: exit early if index != head

2019-07-25 Thread Elijah Newren
We had a rule to enforce that the index matches head, but it was found at the beginning of merge_trees() and would only trigger when opt->call_depth was 0. Since merge_recursive() doesn't call merge_trees() until after returning from recursing, this meant that the check wasn't triggered by merge_r