From: Christian Couder <christian.couder@gmail.com>
Date: Sat, 24 Mar 2018 18:19:42 GMT
Subject: Re: [PATCH 1/4] stash: convert apply to builtin
Message-ID: <CAP8UFD37DgfQ63pPrN2CBH0VjTUuc-N4fq-34bTuyQTH0fR9mA@mail.gmail.com>
In-Reply-To: <20180324173707.17699-2-joel@teichroeb.net>

> +       if (unpack_trees(nr_trees, t, &opts))
> +               return -1;
> +
> +       if (write_locked_index(&the_index, &lock_file, COMMIT_LOCK)) {
> +               error(_("unable to write new index file"));
> +               return -1;

Maybe: return error(...);

> +       }
> +
> +       return 0;
> +}

[...]

> +       argc = parse_options(argc, argv, prefix, options,
> +                       git_stash_helper_apply_usage, 0);
> +
> +       if (argc == 1) {
> +               commit = argv[0];
> +       }

The brackets are not needed.

> +       if (get_stash_info(&info, commit))
> +               return -1;
> +
> +

Spurious new line.

> +       return do_apply_stash(prefix, &info, index);
> +}