diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-03-18 13:51:09 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-03-18 13:51:09 -0700 |
| commit | 9cf0137bdf01d3fe4fdf4cd4b1ad605eebdfb1de (patch) | |
| tree | 4186de735c0e3ffa117467e30b046fb22069f2c9 /t | |
| parent | 1c18a14b637aac5bc0a64441c5884ef8755ba7bf (diff) | |
| parent | 303d1d0bd660b56d25ac6016c085bb3856b08203 (diff) | |
| download | git-9cf0137bdf01d3fe4fdf4cd4b1ad605eebdfb1de.tar.gz git-9cf0137bdf01d3fe4fdf4cd4b1ad605eebdfb1de.tar.xz | |
Merge branch 'bg/install-branch-config-skip-prefix'
* bg/install-branch-config-skip-prefix:
branch: use skip_prefix() in install_branch_config()
t3200-branch: test setting branch as own upstream
Diffstat (limited to 't')
| -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 |