Re: [PATCHv2 1/2] add basic tests for merge-tree

From: Junio C Hamano <gitster@pobox.com>
Date: Jul 13, 2010, 23:31 UTC
Message-ID: <7vaapv0xin.fsf@alter.siamese.dyndns.org>
In-Reply-To: <1278854215-9022-2-git-send-email-wmpalmer@gmail.com>

Will Palmer <wmpalmer@gmail.com> writes:

Show 8 quoted lines

> merge-tree had no test cases, so here we add some very basic tests for
> it, including some known-breakages.
>
> Signed-off-by: Will Palmer <wmpalmer@gmail.com>
> ---
>  t/t4300-merge-tree.sh |  277 +++++++++++++++++++++++++++++++++++++++++++++++++
>  1 files changed, 277 insertions(+), 0 deletions(-)
>  create mode 100755 t/t4300-merge-tree.sh

This does not sound like part of "the diff commands", unlike apply/diff/log. Perhaps somewhere in t3xxx "other basic commands" series?

Show 14 quoted lines

> diff --git a/t/t4300-merge-tree.sh b/t/t4300-merge-tree.sh
> new file mode 100755
> index 0000000..b2ae3a1
> --- /dev/null
> +++ b/t/t4300-merge-tree.sh
> @@ -0,0 +1,277 @@
> ...
> +test_expect_'file add A, !B' '
> +	cat >expected <<EXPECTED
> +added in remote
> +  their  100644 43d5a8ed6ef6c00ff775008633f95787d088285d ONE
> +@@ -0,0 +1 @@
> ++AAA
> +EXPECTED

Since you do not use any variable substitution in the here text, please make that clear by quoting EXPECTED like this:

	cat >expected <<\EXPECTED
... your here text goes here ...
EXPECTED

to help the readers, who otherwise have to scan the here text to find if there is any interesting substitution going on.

> +	git reset --hard initial
> +	test_commit "add-a-not-b" "ONE" "AAA"

Please fix missing && cascades.

Thanks.