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

Re: [PATCH] merge: default to @{upstream}

From
Jonathan Nieder <jrnieder@gmail.com>
Date
Jan 30, 2011, 21:51 UTC
Message-ID
<20110130215105.GA11332@burratino>
In-Reply-To
<AANLkTi=iMJv+Jtj8YdYhQ_sxu+jBht5YqvSnkS2LUerz@mail.gmail.com>
Hi again,

Felipe Contreras wrote: [out of order for convenience]

> Anyway, I don't think we can set argv[1] to NULL, because it's
> possible that this is "char *argv[1]", so that would crash.

The original argc is at least 1 (to include "merge" as argv[0]) before the args are shifted by parse_options_end. But probably that is too tricky to rely on.

> Sure, I need to add documentation and tests. I should probably have
> sent this as 'RFC'.
No problem.  Thanks for keeping the topic alive.
Previous: Felipe ContrerasNext: Bert Wesarg
Message 6 of 9 in “merge: default to @{upstream}”
  1. merge: default to @{upstream}Felipe Contreras, Jan 28, 2011
  2. Drew NorthupJan 28, 2011
  3. Felipe ContrerasJan 28, 2011
  4. Jonathan NiederJan 28, 2011
  5. Felipe ContrerasJan 28, 2011
  6. Jonathan NiederJan 30, 2011
  7. Bert WesargJan 28, 2011
  8. Martin von ZweigbergkJan 28, 2011
  9. Miles BaderJan 31, 2011

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.