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

Re: [PATCH v2 1/2] git-show: fix 'git show -s' to not add extra terminator after merge commit

From
Johannes Sixt <j.sixt@viscovery.net>
Date
May 13, 2014, 05:57 UTC
Message-ID
<5371B434.7010506@viscovery.net>
In-Reply-To
<20140512231029.GD32316@wheezy.local>
Am 5/13/2014 1:10, schrieb Max Kirillov:
Show 8 quoted lines
> --- a/t/t7007-show.sh
> +++ b/t/t7007-show.sh
> @@ -25,6 +25,7 @@ test_expect_success 'set up a bit of history' '
>  	git checkout -b side HEAD^^ &&
>  	test_commit side2 &&
>  	test_commit side3
> +	test_merge merge main3
>  '
Broken &&-chain.
-- Hannes
Previous: Max KirillovNext: Max Kirillov
Message 3 of 7 in “fix 'git show -s' to not add extra terminator after merge commit”
  1. 0/2 fix 'git show -s' to not add extra terminator after merge commitMax Kirillov, May 12, 2014
  2. 1/2 git-show: fix 'git show -s' to not add extra terminator after merge commitMax Kirillov, May 12, 2014
  3. Johannes SixtMay 13, 2014
  4. Max KirillovMay 13, 2014
  5. 2/2 t: git-show: adapt tests to fixed 'git show'Max Kirillov, May 12, 2014
  6. Junio C HamanoMay 13, 2014
  7. Max KirillovMay 13, 2014

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.