From: Junio C Hamano <gitster@pobox.com>
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Cc: Johannes Schindelin via GitGitGadget <gitgitgadget@gmail.com>,
git@vger.kernel.org, Patrick Steinhardt <ps@pks.im>,
Dirk Gouders <dirk@gouders.net>, Jeff King <peff@peff.net>
Subject: Re: [PATCH 2/2] merge-ort/merge-recursive: do report errors in `merge_submodule()`
Date: Sat, 09 Mar 2024 15:18:44 -0800 [thread overview]
Message-ID: <xmqqle6r0zaj.fsf@gitster.g> (raw)
In-Reply-To: <a0af1155-59d9-0c35-f3e9-c0fe1ba0e11b@gmx.de> (Johannes Schindelin's message of "Sat, 9 Mar 2024 21:46:04 +0100 (CET)")
Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:
> By my counting, 5 of the handled cases result in ret = -1, i.e.
> non-recoverable errors, but 8 of the cases result in ret = 0,
> i.e. unclean merges, whereas only 2 cases return 1, i.e. clean
> merges.
Sounds good. Thanks.
next prev parent reply other threads:[~2024-03-09 23:18 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-09 14:09 [PATCH 0/2] The merge-base logic vs missing commit objects (follow-up) Johannes Schindelin via GitGitGadget
2024-03-09 14:09 ` [PATCH 1/2] merge-recursive: prepare for `merge_submodule()` to report errors Johannes Schindelin via GitGitGadget
2024-03-09 14:09 ` [PATCH 2/2] merge-ort/merge-recursive: do report errors in `merge_submodule()` Johannes Schindelin via GitGitGadget
2024-03-09 17:56 ` Junio C Hamano
2024-03-09 20:46 ` Johannes Schindelin
2024-03-09 23:18 ` Junio C Hamano [this message]
2024-03-09 16:51 ` [PATCH 0/2] The merge-base logic vs missing commit objects (follow-up) Elijah Newren
2024-03-09 17:56 ` Junio C Hamano
2024-03-09 17:45 ` Junio C Hamano
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=xmqqle6r0zaj.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=dirk@gouders.net \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=peff@peff.net \
--cc=ps@pks.im \
/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).