git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH 2/2] merge-ort/merge-recursive: do report errors in `merge_submodule()`

From
Junio C Hamano <gitster@pobox.com>
Date
Mar 9, 2024, 23:18 UTC
Message-ID
<xmqqle6r0zaj.fsf@gitster.g>
In-Reply-To
<a0af1155-59d9-0c35-f3e9-c0fe1ba0e11b@gmx.de>
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.
Previous: Johannes SchindelinNext: Elijah Newren
Message 6 of 9 in “The merge-base logic vs missing commit objects (follow-up)”
  1. 0/2 The merge-base logic vs missing commit objects (follow-up)Johannes Schindelin via GitGitGadget, Mar 9, 2024
  2. 1/2 merge-recursive: prepare for `merge_submodule()` to report errorsJohannes Schindelin via GitGitGadget, Mar 9, 2024
  3. 2/2 merge-ort/merge-recursive: do report errors in `merge_submodule()`Johannes Schindelin via GitGitGadget, Mar 9, 2024
  4. Junio C HamanoMar 9, 2024
  5. Johannes SchindelinMar 9, 2024
  6. Junio C HamanoMar 9, 2024
  7. Elijah NewrenMar 9, 2024
  8. Junio C HamanoMar 9, 2024
  9. Junio C HamanoMar 9, 2024

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.