From: Edmundo Carmona Antoranz <eantoranz@gmail.com>
To: Git List <git@vger.kernel.org>
Subject: Re: [PATCH v1] builtin/merge.c - cleanup of code in for-cycle that tests strategies
Date: Sat, 6 Jul 2019 21:15:01 -0600 [thread overview]
Message-ID: <CAOc6etYGA_rHhrDgMbf4x_GxdWwgWy7W2Kqvv6PsMMHFP0U_vA@mail.gmail.com> (raw)
In-Reply-To: <20190707000052.26057-1-eantoranz@gmail.com>
On Sat, Jul 6, 2019 at 6:00 PM Edmundo Carmona Antoranz
<eantoranz@gmail.com> wrote:
> @@ -1645,6 +1631,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
> * auto resolved the merge cleanly.
> */
> if (automerge_was_ok) {
> + write_tree_trivial(&result_tree);
> ret = finish_automerge(head_commit, head_subsumed,
> common, remoteheads,
> &result_tree, wt_strategy);
I realized later that the call to write_tree_trivial could be included
in finish_automerge. Will include this change on v2 of the patch (if
there's a v2, depending on feedback).
next prev parent reply other threads:[~2019-07-07 3:15 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-07 0:00 [PATCH v1] builtin/merge.c - cleanup of code in for-cycle that tests strategies Edmundo Carmona Antoranz
2019-07-07 3:15 ` Edmundo Carmona Antoranz [this message]
2019-07-08 20:15 ` Junio C Hamano
2019-07-08 20:52 ` Edmundo Carmona Antoranz
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CAOc6etYGA_rHhrDgMbf4x_GxdWwgWy7W2Kqvv6PsMMHFP0U_vA@mail.gmail.com \
--to=eantoranz@gmail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).