diff options
| author | Brian Gesiak <modocache@gmail.com> | 2014-03-05 16:31:55 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-03-06 13:53:06 -0800 |
| commit | 95052d1f2db7103b4ff8d44591fc614419ae6eb2 (patch) | |
| tree | f5adc7dc6034eeafefcb188cb09da8d724dcac79 /t/t3200-branch.sh | |
| parent | 5f95c9f850b19b368c43ae399cc831b17a26a5ac (diff) | |
| download | git-95052d1f2db7103b4ff8d44591fc614419ae6eb2.tar.gz git-95052d1f2db7103b4ff8d44591fc614419ae6eb2.tar.xz | |
t3200-branch: test setting branch as own upstream
No test asserts that "git branch -u refs/heads/my-branch my-branch"
avoids leaving nonsense configuration and emits a warning.
Add a test that does so.
Signed-off-by: Brian Gesiak <modocache@gmail.com>
Helped-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t3200-branch.sh')
| -rwxr-xr-x | t/t3200-branch.sh | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh index fcdb86774..83037b1cd 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 notices an error 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_expect_code 1 git config branch.my13.remote && + test_expect_code 1 git config branch.my13.merge && + test_i18ncmp expected actual +' + # 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 |