Merge branch 'sp/remote'

* sp/remote:
  Make "git-remote rm" delete refs acccording to fetch specs
  Make "git-remote prune" delete refs according to fetch specs
  Remove unused remote_prefix member in builtin-remote
This commit is contained in:
Junio C Hamano
2008-06-01 23:43:30 -07:00
2 changed files with 74 additions and 36 deletions

View File

@ -164,6 +164,24 @@ test_expect_success 'add --mirror && prune' '
git rev-parse --verify refs/heads/side)
'
test_expect_success 'add alt && prune' '
(mkdir alttst &&
cd alttst &&
git init &&
git remote add -f origin ../one &&
git config remote.alt.url ../one &&
git config remote.alt.fetch "+refs/heads/*:refs/remotes/origin/*") &&
(cd one &&
git branch -m side side2) &&
(cd alttst &&
git rev-parse --verify refs/remotes/origin/side &&
! git rev-parse --verify refs/remotes/origin/side2 &&
git fetch alt &&
git remote prune alt &&
! git rev-parse --verify refs/remotes/origin/side &&
git rev-parse --verify refs/remotes/origin/side2)
'
cat > one/expect << EOF
apis/master
apis/side