[PATCH] t3200-branch: test setting branch as own upstream
- From
Brian Gesiak <modocache@gmail.com>
- Date
- Mar 5, 2014, 07:31 UTC
- Message-ID
- <1394004715-18776-1-git-send-email-modocache@gmail.com>
- In-Reply-To
- <xmqqmwh5ikl0.fsf@gitster.dls.corp.google.com>
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 <modocache@gmail.com> --- t/t3200-branch.sh | 10 ++++++++++ 1 file changed, 10 insertions(+)
diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh index fcdb867..e6d4015 100755 --- a/t/t3200-branch.sh +++ b/t/t3200-branch.sh @@ -507,6 +507,16 @@ 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 <<EOF && +warning: Not setting branch my13 as its own upstream. +EOF + test_i18ncmp expected actual && + test_must_fail git config branch.my13.remote && + test_must_fail git config branch.my13.merge +' + # Keep this test last, as it changes the current branch cat >expect <<EOF $_z40 $HEAD $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1117150200 +0000 branch: Created from master
-- 1.8.3.4 (Apple Git-47)