Re: [PATCH v2 1/2] t3200-branch: test setting branch as own upstream

2014-03-04 Thread Junio C Hamano
Brian Gesiak  writes:

> No test asserts that "git branch -u refs/heads/my-branch my-branch"
> emits a warning. Add a test that does so.
>
> Signed-off-by: Brian Gesiak 
> ---
>  t/t3200-branch.sh | 8 
>  1 file changed, 8 insertions(+)
>
> diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh
> index fcdb867..6164126 100755
> --- a/t/t3200-branch.sh
> +++ b/t/t3200-branch.sh
> @@ -507,6 +507,14 @@ EOF
>   test_cmp expected actual
>  '
>  
> +test_expect_success '--set-upstream-to shows warning if used to set branch 
> as own upstream' '
> + git branch --set-upstream-to refs/heads/my13 my13 2>actual &&
> + cat >expected < +warning: Not setting branch my13 as its own upstream.
> +EOF
> + test_i18ncmp expected actual
> +'
> +

Checking the error message is fine, but we are also interested in
seeing that we do not leave such a nonsense configuration, if not
more.  Shouldn't we check the resulting config as well here?

>  # Keep this test last, as it changes the current branch
>  cat >expect <  $_z40 $HEAD $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1117150200 +  
> branch: Created from master
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[PATCH v2 1/2] t3200-branch: test setting branch as own upstream

2014-02-27 Thread Brian Gesiak
No test asserts that "git branch -u refs/heads/my-branch my-branch"
emits a warning. Add a test that does so.

Signed-off-by: Brian Gesiak 
---
 t/t3200-branch.sh | 8 
 1 file changed, 8 insertions(+)

diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh
index fcdb867..6164126 100755
--- a/t/t3200-branch.sh
+++ b/t/t3200-branch.sh
@@ -507,6 +507,14 @@ EOF
test_cmp expected actual
 '
 
+test_expect_success '--set-upstream-to shows warning if used to set branch as 
own upstream' '
+   git branch --set-upstream-to refs/heads/my13 my13 2>actual &&
+   cat >expected