Re: [PATCH 63/83] builtin/apply: make apply_all_patches() return -1 on error

2016-05-03 Thread Christian Couder
On Sun, May 1, 2016 at 11:03 PM, Eric Sunshine wrote: >> @@ -4590,10 +4590,10 @@ static int apply_all_patches(struct apply_state >> *state, >> squelched); >> } >> if (state->ws_error_action ==

Re: [PATCH 63/83] builtin/apply: make apply_all_patches() return -1 on error

2016-05-02 Thread Johannes Schindelin
Hi Eric, On Sun, 1 May 2016, Eric Sunshine wrote: > On Sun, Apr 24, 2016 at 9:34 AM, Christian Couder > wrote: > > Signed-off-by: Christian Couder > > --- > > diff --git a/builtin/apply.c b/builtin/apply.c > > @@ -4562,12 +4562,12 @@ static

Re: [PATCH 63/83] builtin/apply: make apply_all_patches() return -1 on error

2016-05-01 Thread Eric Sunshine
On Sun, Apr 24, 2016 at 9:34 AM, Christian Couder wrote: > Signed-off-by: Christian Couder > --- > diff --git a/builtin/apply.c b/builtin/apply.c > @@ -4562,12 +4562,12 @@ static int apply_all_patches(struct apply_state > *state, > >

Re: [PATCH 63/83] builtin/apply: make apply_all_patches() return -1 on error

2016-05-01 Thread Christian Couder
On Mon, Apr 25, 2016 at 3:30 PM, Duy Nguyen wrote: > On Sun, Apr 24, 2016 at 8:34 PM, Christian Couder > wrote: >> if (state->update_index) { >> if (write_locked_index(_index, state->lock_file, >> COMMIT_LOCK)) >> -

Re: [PATCH 63/83] builtin/apply: make apply_all_patches() return -1 on error

2016-04-25 Thread Duy Nguyen
On Sun, Apr 24, 2016 at 8:34 PM, Christian Couder wrote: > if (state->update_index) { > if (write_locked_index(_index, state->lock_file, > COMMIT_LOCK)) > - die(_("Unable to write new index file")); > +

[PATCH 63/83] builtin/apply: make apply_all_patches() return -1 on error

2016-04-24 Thread Christian Couder
Signed-off-by: Christian Couder --- builtin/apply.c | 23 +-- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/builtin/apply.c b/builtin/apply.c index eab5ae1..73247c7 100644 --- a/builtin/apply.c +++ b/builtin/apply.c @@ -4551,7