From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Finn Arne Gangstad <finnag@pvv.org>
Cc: gitster@pobox.com, git@vger.kernel.org
Subject: Re: [PATCH] Improved submodule merge support
Date: Tue, 18 Dec 2007 20:21:56 +0000 (GMT) [thread overview]
Message-ID: <Pine.LNX.4.64.0712182018190.23902@racer.site> (raw)
In-Reply-To: <20071218195028.GA25510@pvv.org>
Hi,
On Tue, 18 Dec 2007, Finn Arne Gangstad wrote:
> diff --git a/merge-recursive.c b/merge-recursive.c
> index 2a58dad..33ccc40 100644
> --- a/merge-recursive.c
> +++ b/merge-recursive.c
> @@ -1463,10 +1467,13 @@ static int process_entry(const char *path, struct stage_data *entry,
> mfi = merge_file(&o, &a, &b,
> branch1, branch2);
>
> + clean_merge = mfi.clean;
> if (mfi.clean)
> update_file(1, mfi.sha, mfi.mode, path);
> + else if (S_ISGITLINK(mfi.mode))
> + output(1, "CONFLICT (submodule): Merge conflict in %s "
> + "- needs %s", path, sha1_to_hex(b.sha1));
> else {
> - clean_merge = 0;
> output(1, "CONFLICT (%s): Merge conflict in %s",
> reason, path);
>
It took me a little while to find that the unilateral assignment to
clean_merge does not break things. But as it was only set to 1 at the
beginning of the function, and no loops are involved, this change is
correct.
Ciao,
Dscho
prev parent reply other threads:[~2007-12-18 20:23 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-12-18 19:50 [PATCH] Improved submodule merge support Finn Arne Gangstad
2007-12-18 20:21 ` Johannes Schindelin [this message]
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=Pine.LNX.4.64.0712182018190.23902@racer.site \
--to=johannes.schindelin@gmx.de \
--cc=finnag@pvv.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/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.
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 NNTP newsgroup(s).