From: Junio C Hamano <gitster@pobox.com>
To: David Turner <dturner@twosigma.com>
Cc: git@vger.kernel.org, sbeller@google.com
Subject: Re: [PATCH] submodules: allow empty working-tree dirs in merge/cherry-pick
Date: Thu, 17 Nov 2016 20:47:54 -0800 [thread overview]
Message-ID: <xmqqwpg1mm11.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <1478543491-6286-1-git-send-email-dturner@twosigma.com> (David Turner's message of "Mon, 7 Nov 2016 13:31:31 -0500")
David Turner <dturner@twosigma.com> writes:
> diff --git a/t/t3030-merge-recursive.sh b/t/t3030-merge-recursive.sh
> index 470f334..be074a1 100755
> --- a/t/t3030-merge-recursive.sh
> +++ b/t/t3030-merge-recursive.sh
> @@ -575,13 +575,13 @@ test_expect_success 'merge removes empty directories' '
> test_must_fail test -d d
> '
>
> -test_expect_failure 'merge-recursive simple w/submodule' '
> +test_expect_success 'merge-recursive simple w/submodule' '
>
> git checkout submod &&
> git merge remove
> '
>
> -test_expect_failure 'merge-recursive simple w/submodule result' '
> +test_expect_sucess 'merge-recursive simple w/submodule result' '
Here is a typo. I wonder if we want to do "set -e" at the end of
test-lib.sh to catch a breakage like this. I only caught it by
being lucky (I was staring "make test" output as it flew by).
I've already amended the copy I have, but in case you are going to
reroll in the future, please do not forget to update your copy.
prev parent reply other threads:[~2016-11-18 4:48 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-11-07 18:31 [PATCH] submodules: allow empty working-tree dirs in merge/cherry-pick David Turner
2016-11-07 19:13 ` Stefan Beller
2016-11-07 20:38 ` David Turner
2016-11-07 20:48 ` Stefan Beller
2016-11-18 4:47 ` Junio C Hamano [this message]
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqwpg1mm11.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=dturner@twosigma.com \
--cc=git@vger.kernel.org \
--cc=sbeller@google.com \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).