Re: [PATCH 83/83] builtin/am: use apply api in run_apply()

Hi Dscho, On Mon, Apr 25, 2016 at 5:03 PM, Johannes Schindelin wrote: > Hi Chris, > > On Sun, 24 Apr 2016, Christian Couder wrote: > >> [...] >> /* >>* If we are allowed to fall back on 3-way merge, don't give false >>* errors during the initial

Re: [PATCH 83/83] builtin/am: use apply api in run_apply()

Hi Chris, On Sun, 24 Apr 2016, Christian Couder wrote: > [...] > /* >* If we are allowed to fall back on 3-way merge, don't give false >* errors during the initial attempt. >*/ > + > if (state->threeway && !index_file) { > - cp.no_stdout = 1; > -

[PATCH 83/83] builtin/am: use apply api in run_apply()

This replaces run_apply() implementation with a new one that uses the apply api that has been previously prepared in apply.c and apply.h. This shoud improve performance a lot in certain cases. As the previous implementation was creating a new `git apply` process to apply each patch, it could be