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

Re: [PATCH v5 2/4] merge: introduce setup_merge_commit helper function

From
Junio C Hamano <gitster@pobox.com>
Date
Feb 11, 2011, 01:36 UTC
Message-ID
<7voc6j1hey.fsf@alter.siamese.dyndns.org>
In-Reply-To
<1297381964-7137-3-git-send-email-jaredhance@gmail.com>
Jared Hance <jaredhance@gmail.com> writes:
Show 6 quoted lines
>  	for (i = 0; i < argc; i++) {
> -		struct object *o;
> ...
> -		strbuf_reset(&buf);
> +		setup_merge_commit(&buf, &remotes, argv[i]);
>  	}
Micronit; the body becomes a single statement and you should lose the {}.
Thanks.  No need to resend.
Previous: Jared HanceNext: Jared Hance
Message 5 of 8 in “Updated patch series for default upstream merge”
  1. 0/4 Updated patch series for default upstream mergeJared Hance, Feb 10, 2011
  2. 1/4 merge: update the usage information to be more modernJared Hance, Feb 10, 2011
  3. Drew NorthupFeb 12, 2011
  4. 2/4 merge: introduce setup_merge_commit helper functionJared Hance, Feb 10, 2011
  5. Junio C HamanoFeb 11, 2011
  6. 3/4 merge: introduce per-branch-configuration helper functionJared Hance, Feb 10, 2011
  7. 4/4 merge: add support for merging from upstream by defaultJared Hance, Feb 10, 2011
  8. Junio C HamanoFeb 11, 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.