Re: [PATCH 2/3] contrib/subtree/t: Added tests for .gitsubtree support

From: Jonathan Nieder <jrnieder@gmail.com>
Date: Feb 15, 2013, 22:56 UTC
Message-ID: <20130215225624.GB21165@google.com>
In-Reply-To: <CALeLG_=ir-kBTYpsRr_Hf8q2UY2ZtjShbTkO_tH=YiWSskfPOw@mail.gmail.com>

Hi Paul,

Paul Campbell wrote:

> --- a/contrib/subtree/t/t7900-subtree.sh
> +++ b/contrib/subtree/t/t7900-subtree.sh
> @@ -465,4 +465,34 @@ test_expect_success 'verify one file change per commit' '

[...]

> +test_expect_success 'change in subtree is pushed okay' '
> +        cd copy0 && create new_file && git commit -m"Added new_file" &&
> +        cd .. && git subtree push --prefix=copy0 2>&1 | \

If it possible to restrict the chdirs to subshells, that can make the test more resiliant to early failures without breaking later tests.

That is:

	(
		cd copy0 &&
		create new_file &&
		test_tick &&
		git commit -m "add new_file"
	) &&
	git subtree push --prefix=copy0 >output 2>&1 &&
	grep "..." output

> +                grep "^\s\{3\}[0-9a-f]\{7\}\.\.[0-9a-f]\{7\}\s\s[0-9a-f]\{40\}\s->\ssub1$"

This might not be portable if I understand Documentation/CodingGuidelines correctly.

[...]

> +        (grep "^copy3 . sub2$" .gitsubtree && die || true) &&

	! grep "^copy3 . sub2\$" .gitsubtree &&

Hope that helps, Jonathan