From: Johannes Sixt <j.sixt@viscovery.net>
To: Max Kirillov <max@max630.net>
Cc: Junio C Hamano <gitster@pobox.com>, git@vger.kernel.org
Subject: Re: [PATCH v2 1/2] git-show: fix 'git show -s' to not add extra terminator after merge commit
Date: Tue, 13 May 2014 07:57:08 +0200 [thread overview]
Message-ID: <5371B434.7010506@viscovery.net> (raw)
In-Reply-To: <20140512231029.GD32316@wheezy.local>
Am 5/13/2014 1:10, schrieb Max Kirillov:
> --- 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
next prev parent reply other threads:[~2014-05-13 5:57 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-05-12 23:09 [PATCH v2 0/2] fix 'git show -s' to not add extra terminator after merge commit Max Kirillov
2014-05-12 23:10 ` [PATCH v2 1/2] git-show: " Max Kirillov
2014-05-13 5:57 ` Johannes Sixt [this message]
2014-05-13 20:15 ` Max Kirillov
2014-05-12 23:11 ` [PATCH v2 2/2] t: git-show: adapt tests to fixed 'git show' Max Kirillov
2014-05-13 19:26 ` Junio C Hamano
2014-05-13 20:09 ` Max Kirillov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5371B434.7010506@viscovery.net \
--to=j.sixt@viscovery.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=max@max630.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).