From: Jeff King Date: Tue, 2 Apr 2013 19:02:53 +0000 (-0400) Subject: t3200: test --set-upstream-to with bogus refs X-Git-Tag: v1.8.3-rc0~98^2~4 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8a3e5ecdaa9fc45d7af58eb95bba0f39ca625a8d;p=git t3200: test --set-upstream-to with bogus refs These tests pass with the current code, but let's make sure we don't accidentally break the behavior in the future. Note that our tests expect failure when we try to set the upstream to or from a missing branch. Technically we are just munging config here, so we do not need the refs to exist. But seeing that they do exist is a good check that the user has not made a typo. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano --- diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh index b08c9f2295..09f65f8358 100755 --- a/t/t3200-branch.sh +++ b/t/t3200-branch.sh @@ -409,6 +409,18 @@ test_expect_success '--set-upstream-to fails on detached HEAD' ' git checkout - ' +test_expect_success '--set-upstream-to fails on a missing dst branch' ' + test_must_fail git branch --set-upstream-to master does-not-exist +' + +test_expect_success '--set-upstream-to fails on a missing src branch' ' + test_must_fail git branch --set-upstream-to does-not-exist master +' + +test_expect_success '--set-upstream-to fails on a non-ref' ' + test_must_fail git branch --set-upstream-to HEAD^{} +' + test_expect_success 'use --set-upstream-to modify HEAD' ' test_config branch.master.remote foo && test_config branch.master.merge foo &&