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

From: Duy Nguyen <pclouds@gmail.com>
Date: Apr 25, 2016, 13:30 UTC
Message-ID: <CACsJy8CRiAhHqYDrJifhfarqzarEnuuJm4rw18zxnC9xaBwKNw@mail.gmail.com>
In-Reply-To: <1461504863-15946-64-git-send-email-chriscool@tuxfamily.org>

On Sun, Apr 24, 2016 at 8:34 PM, Christian Couder <christian.couder@gmail.com> wrote:

Show 14 quoted lines

>         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.

Show 6 quoted lines

> +
> +       return 0;
>  }
> --
> 2.8.1.300.g5fed0c0
>

-- 
Duy