mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'mz/remote-rename'

Browse Source 
* mz/remote-rename:
  remote: only update remote-tracking branch if updating refspec
  remote rename: warn when refspec was not updated
  remote: "rename o foo" should not rename ref "origin/bar"
  remote: write correct fetch spec when renaming remote 'remote'
This commit is contained in:
Junio C Hamano
2011-10-10 15:56:17 -07:00
parent ca3ef81ad7 b52d00aede
commit 034a8a0df3
2 changed files with 52 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
t/t5505-remote.sh
View File

@ -631,6 +631,37 @@ test_expect_success 'rename a remote' '
'
test_expect_success 'rename does not update a non-default fetch refspec' '
git clone one four.one &&
(cd four.one &&
git config remote.origin.fetch +refs/heads/*:refs/heads/origin/* &&
git remote rename origin upstream &&
test "$(git config remote.upstream.fetch)" = "+refs/heads/*:refs/heads/origin/*" &&
git rev-parse -q origin/master)
'
test_expect_success 'rename a remote with name part of fetch spec' '
git clone one four.two &&
(cd four.two &&
git remote rename origin remote &&
git remote rename remote upstream &&
test "$(git config remote.upstream.fetch)" = "+refs/heads/*:refs/remotes/upstream/*")
'
test_expect_success 'rename a remote with name prefix of other remote' '
git clone one four.three &&
(cd four.three &&
git remote add o git://example.com/repo.git &&
git remote rename o upstream &&
test "$(git rev-parse origin/master)" = "$(git rev-parse master)")
'
cat > remotes_origin << EOF
URL: $(pwd)/one
Push: refs/heads/master:refs/heads/upstream