Re: [PATCH 2/8] sequencer: introduce the `merge` command

From: Eric Sunshine <sunshine@sunshineco.com>
Date: Jan 19, 2018, 09:54 UTC
Message-ID: <CAPig+cQgNSijA-sW+AGNAHOgnJVdUGaDWjro4KVWO=vefnEPuQ@mail.gmail.com>
In-Reply-To: <647382ac70bfb7035345304a32d08f4e7b51cd40.1516225925.git.johannes.schindelin@gmx.de>

On Thu, Jan 18, 2018 at 10:35 AM, Johannes Schindelin <johannes.schindelin@gmx.de> wrote:

Show 5 quoted lines

> [...]
> Note: this patch only adds support for recursive merges, to keep things
> simple. Support for octopus merges will be added later in this patch
> series, support for merges using strategies other than the recursive
> merge is left for future contributions.

The above paragraph...

Show 5 quoted lines

> The design of the `merge` command as introduced by this patch only
> supports creating new merge commits with exactly two parents, i.e. it
> adds no support for octopus merges.
>
> We will introduce support for octopus merges in a later commit.

and these two sentences say the same thing. I suppose one or the other was meant to be dropped(?).

Show 10 quoted lines

> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
> ---
> diff --git a/sequencer.c b/sequencer.c
> @@ -2069,6 +2077,132 @@ static int do_reset(const char *name, int len)
> +static int do_merge(struct commit *commit, const char *arg, int arg_len,
> +                   struct replay_opts *opts)
> +{
> +       [...]
> +               if (write_message(body, len, git_path_merge_msg(), 0) < 0) {
> +                       error_errno(_("Could not write '%s'"),

s/Could/could/

> +               if (write_message(p, len, git_path_merge_msg(), 0) < 0) {
> +                       error_errno(_("Could not write '%s'"),

Ditto.

> +       if (!head_commit) {
> +               rollback_lock_file(&lock);
> +               return error(_("Cannot merge without a current revision"));

s/Cannot/cannot/