Re: [PATCH 63/83] builtin/apply: make apply_all_patches() return -1 on error
- From
Christian Couder <christian.couder@gmail.com>
- Date
- May 1, 2016, 18:32 UTC
- Message-ID
- <CAP8UFD3c6YHi33kwu=yB60oRqv91GLDm7J4zb5nxcVi6XNJo9A@mail.gmail.com>
- In-Reply-To
- <CACsJy8CRiAhHqYDrJifhfarqzarEnuuJm4rw18zxnC9xaBwKNw@mail.gmail.com>
On Mon, Apr 25, 2016 at 3:30 PM, Duy Nguyen <pclouds@gmail.com> wrote:
Show 20 quoted lines
> On Sun, Apr 24, 2016 at 8:34 PM, Christian Couder
> <christian.couder@gmail.com> wrote:
>> if (state->update_index) {
>> if (write_locked_index(&the_index, state->lock_file, COMMIT_LOCK))
>> - die(_("Unable to write new index file"));
>> + return error(_("Unable to write new index file"));
>> }
>>
>> return !!errs;
>> @@ -4698,5 +4698,8 @@ int cmd_apply(int argc, const char **argv, const char *prefix)
>> if (check_apply_state(&state, force_apply))
>> exit(1);
>>
>> - return apply_all_patches(&state, argc, argv, options);
>> + if (apply_all_patches(&state, argc, argv, options))
>> + exit(1);
>
> Abusing exit() too much? This is cmd_apply(). A return should be
> enough and you can do the !! trick that is used in
> apply_all_patches(), shown just a little bit above.Ok, I will use:
return !!apply_all_patches(&state, argc, argv, options);
Thanks, Christian.