Skip to content

Commit

Permalink
Test "git remote show" and "git remote prune"
Browse files Browse the repository at this point in the history
While at it, also fix a few instances where a cd was done outside of a
subshell.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Johannes Schindelin authored and Junio C Hamano committed Mar 1, 2008
1 parent a0ec9d2 commit 4704640
Showing 1 changed file with 34 additions and 0 deletions.
34 changes: 34 additions & 0 deletions t/t5505-remote.sh
Original file line number Diff line number Diff line change
Expand Up @@ -94,4 +94,38 @@ test_expect_success 'remove remote' '
)
'

cat > test/expect << EOF
* remote origin
URL: $(pwd)/one/.git
Remote branch(es) merged with 'git pull' while on branch master
master
New remote branches (next fetch will store in remotes/origin)
master
Tracked remote branches
side master
EOF

test_expect_success 'show' '
(cd test &&
git config --add remote.origin.fetch \
refs/heads/master:refs/heads/upstream &&
git fetch &&
git branch -d -r origin/master &&
(cd ../one &&
echo 1 > file &&
git commit -m update file) &&
git remote show origin > output &&
git diff expect output)
'

test_expect_success 'prune' '
(cd one &&
git branch -m side side2) &&
(cd test &&
git fetch origin &&
git remote prune origin &&
git rev-parse refs/remotes/origin/side2 &&
! git rev-parse refs/remotes/origin/side)
'

test_done

0 comments on commit 4704640

Please sign in to comment.