Re: [PATCH 1/5] t1507: add additional tests for @{upstream}

[Junio C Hamano <gitster@pobox.com>]

Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> writes:

> +error_message () {
> +	(cd clone &&
> +	 test_must_fail git rev-parse --verify "$@")
> +}
> ...
> +test_expect_success 'branch@{u} error message when no upstream' '
> +	cat >expect <<-EOF &&
> +	error: No upstream branch found for ${sq}non-tracking${sq}
> +	fatal: Needed a single revision
> +	EOF
> +	(cd clone &&
> +	 test_must_fail git rev-parse --verify non-tracking@{u}) 2>actual &&

Why not use "error_message" as other new tests?

> +	test_cmp expect actual

Should we worry about test_i18ncmp here (and all the other test_cmp this
patch introduces)?

> +'
> +
> +test_expect_success '@{u} error message when no upstream' '
> +	cat >expect <<-EOF &&
> +	error: No upstream branch found for ${sq}${sq}
> +	fatal: Needed a single revision
> +	EOF
> +	test_must_fail git rev-parse --verify @{u} 2>actual &&
> +	test_cmp expect actual
> +'

We may want to update the error message for "@{u}" when the current one is
not tracked, instead of saying ''.  Perhaps

	error: No upstream branch found for the current branch.

or something?

Likewise for the detached HEAD case.

> +test_expect_success 'branch@{u} error message if upstream branch not fetched' '
> +	cat >expect <<-EOF &&
> +	error: No upstream branch found for ${sq}bad-upstream${sq}
> +	fatal: Needed a single revision
> +	EOF
> +	error_message bad-upstream@{u} 2>actual &&
> +	test_cmp expect actual
> +'
> +
> +test_expect_success 'pull works when tracking a local branch' '
> +(
> +	cd clone &&
> +	git checkout local-master &&
> +	git pull
> +)
> +'
> +
> +# makes sense if the previous one succeeded

Can't you make this not to depend on the result of the previous test
(Which one?  The immediately previous one is done in "clone" directory,
so that is not it)?

> +test_expect_success '@{u} works when tracking a local branch' '
> +	test refs/heads/master = "$(full_name @{u})"
> +'
> +
>  cat >expect <<EOF
>  commit 8f489d01d0cc65c3b0f09504ec50b5ed02a70bd5
>  Reflog: master@{0} (C O Mitter <committer@example.com>)