summaryrefslogtreecommitdiff
path: root/t/t5505-remote.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-11-23 00:03:15 -0800
committerJunio C Hamano <gitster@pobox.com>2009-11-23 00:03:15 -0800
commit65c042d44dc843021f1410f1219104681fdd3469 (patch)
treeead97f95ff999e3279929760d095c0edcb1adf1a /t/t5505-remote.sh
parentfc13aa3d09407998e5cb08a5c1da05d0000fe81d (diff)
parent8db355964d89c19eb262ffe38e57e5a610e1cc05 (diff)
downloadgit-65c042d44dc843021f1410f1219104681fdd3469.tar.gz
Merge branch 'bg/fetch-multi'
* bg/fetch-multi: Re-implement 'git remote update' using 'git fetch' builtin-fetch: add --dry-run option builtin-fetch: add --prune option teach warn_dangling_symref to take a FILE argument remote: refactor some logic into get_stale_heads() Add missing test for 'git remote update --prune' Add the configuration option skipFetchAll Teach the --multiple option to 'git fetch' Teach the --all option to 'git fetch'
Diffstat (limited to 't/t5505-remote.sh')
-rwxr-xr-xt/t5505-remote.sh11
1 files changed, 11 insertions, 0 deletions
diff --git a/t/t5505-remote.sh b/t/t5505-remote.sh
index 220b6a3413..fd166d9de3 100755
--- a/t/t5505-remote.sh
+++ b/t/t5505-remote.sh
@@ -365,6 +365,17 @@ test_expect_success 'update with arguments' '
'
+test_expect_success 'update --prune' '
+
+ (cd one &&
+ git branch -m side2 side3) &&
+ (cd test &&
+ git remote update --prune &&
+ (cd ../one && git branch -m side3 side2)
+ git rev-parse refs/remotes/origin/side3 &&
+ test_must_fail git rev-parse refs/remotes/origin/side2)
+'
+
cat > one/expect << EOF
apis/master
apis/side