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

Re: [PATCH 2/5] merge-recursive: porcelain messages for checkout

From
Junio C Hamano <gitster@pobox.com>
Date
Aug 9, 2010, 19:58 UTC
Message-ID
<7vhbj34kz8.fsf@alter.siamese.dyndns.org>
In-Reply-To
<1281363602-27856-3-git-send-email-Matthieu.Moy@imag.fr>
Matthieu Moy <Matthieu.Moy@imag.fr> writes:
Show 5 quoted lines
> +void set_porcelain_error_msgs(const char **msgs, const char *cmd)
>  {
> +	const char *msg;
> +	char *tmp;
> +	const char *cmd2 = strcmp(cmd, "checkout") ? cmd : "switch branches";

This may have implications to the later i18n effort, but lets ignore it for now. I don't think it will be too bad.

Previous: Matthieu MoyNext: Matthieu Moy
Message 11 of 16 in “Better error messages for checkout and merge.”
  1. 0/5 Better error messages for checkout and merge.Matthieu Moy, Aug 9, 2010
  2. 1/5 Turn unpack_trees_options.msgs into an array + enumMatthieu Moy, Aug 9, 2010
  3. Junio C HamanoAug 9, 2010
  4. Matthieu MoyAug 9, 2010
  5. 1/5 Turn unpack_trees_options.msgs into an array + enumMatthieu Moy, Aug 11, 2010
  6. 2/5 merge-recursive: porcelain messages for checkoutMatthieu Moy, Aug 11, 2010
  7. 3/5 merge-recursive: distinguish "removed" and "overwritten" messagesMatthieu Moy, Aug 11, 2010
  8. 4/5 unpack_trees: group error messages by typeMatthieu Moy, Aug 11, 2010
  9. 5/5 t7609: test merge and checkout error messagesMatthieu Moy, Aug 11, 2010
  10. 2/5 merge-recursive: porcelain messages for checkoutMatthieu Moy, Aug 9, 2010
  11. Junio C HamanoAug 9, 2010
  12. Matthieu MoyAug 9, 2010
  13. Ævar Arnfjörð BjarmasonAug 9, 2010
  14. 3/5 merge-recursive: distinguish "removed" and "overwritten" messagesMatthieu Moy, Aug 9, 2010
  15. 4/5 unpack_trees: group error messages by typeMatthieu Moy, Aug 9, 2010
  16. 5/5 t7609: test merge and checkout error messagesMatthieu Moy, Aug 9, 2010

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.