Re: [PATCH 2/8] sequencer: introduce the `merge` command
From: Eric Sunshine <hidden>
Date: 2018-01-19 09:54:57
On Thu, Jan 18, 2018 at 10:35 AM, Johannes Schindelin [off-list ref] wrote:
[...] 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...
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(?).
quoted hunk ↗ jump to hunk
Signed-off-by: Johannes Schindelin <redacted> ---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/