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

Re: [PATCH 1/3] octopus: make merge process simpler to follow

From
Junio C Hamano <gitster@pobox.com>
Date
Dec 12, 2009, 20:46 UTC
Message-ID
<7vk4wrrkce.fsf@alter.siamese.dyndns.org>
In-Reply-To
<200912122056.59297.j6t@kdbg.org>
Johannes Sixt <j6t@kdbg.org> writes:
Show 6 quoted lines
> On Samstag, 12. Dezember 2009, Stephen Boyd wrote:
>> +	pretty_name="$(eval echo \$GITHEAD_$SHA1)"
>
> 	eval pretty_name=\$GITHEAD_$SHA1
>
> :)

True, and also there can be scripts that call merge-octupos directly without setting "GITHEAD_$commit", so it would probably need something like

	: ${pretty_name:=$SHA1}
after that.
Previous: Johannes SixtNext: Stephen Boyd
Message 6 of 14 in “FEATURE REQUEST: Announce branch name with merge comamnd”
  1. Jari AaltoDec 11, 2009
  2. Junio C HamanoDec 11, 2009
  3. 1/3 octopus: make merge process simpler to followStephen Boyd, Dec 12, 2009
  4. Junio C HamanoDec 12, 2009
  5. Johannes SixtDec 12, 2009
  6. Junio C HamanoDec 12, 2009
  7. octopus: make merge process simpler to followStephen Boyd, Dec 15, 2009
  8. Junio C HamanoDec 15, 2009
  9. Stephen BoydDec 15, 2009
  10. 2/3 octopus: reenable fast-forward mergesStephen Boyd, Dec 12, 2009
  11. 3/3 octopus: remove dead codeStephen Boyd, Dec 12, 2009
  12. Junio C HamanoDec 12, 2009
  13. Alex RiesenDec 12, 2009
  14. Jari AaltoDec 12, 2009

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.