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

Re: [PATCH 1/1] [Outreachy] merge-ours: include parse-options

From
Junio C Hamano <gitster@pobox.com>
Date
Oct 30, 2019, 02:05 UTC
Message-ID
<xmqqk18n3s3i.fsf@gitster-ct.c.googlers.com>
In-Reply-To
<8c088194f604eac3a6b00c48a7fddfdf807571fc.1572306149.git.gitgitgadget@gmail.com>
"george espinoza via GitGitGadget" <gitgitgadget@gmail.com> writes:
Show 5 quoted lines
> From: george espinoza <gespinoz2019@gmail.com>
>
> Teach this command which currently handles its own argv to use
> parse-options instead because parse-options helps make sure we handle
> user input like -h in a standardized way across the project.

Sorry, but why do we even want to do this? merge-ours is an implementation detail of "git merge" and is never run directly by end-users.

I am not sure why it even needs "-h" in the first place, but that is already there, so letting sleeping dog lie would be what I would prefer.

Is there a plan to add some -Xmerge-backend-option to this program, and would use of parse-options API make it easier? That would be a good reason to start using it in this program, but otherwise...

Previous: George EspinozaNext: George Espinoza
Message 6 of 9 in “[Outreachy] merge-ours: include a parse-option”
  1. 0/1 [Outreachy] merge-ours: include a parse-optionGeorge Espinoza via GitGitGadget, Oct 28, 2019
  2. 1/1 [Outreachy] merge-ours: include parse-optionsgeorge espinoza via GitGitGadget, Oct 28, 2019
  3. Johannes SchindelinOct 29, 2019
  4. Emily ShafferOct 29, 2019
  5. George EspinozaOct 30, 2019
  6. Junio C HamanoOct 30, 2019
  7. George EspinozaOct 30, 2019
  8. Johannes SchindelinOct 30, 2019
  9. Junio C HamanoNov 2, 2019

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.