summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2008-06-25 13:18:54 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2008-06-25 13:18:54 -0700
commit01d8ff70f40d8be3c4e2efb245ffc3d013b7fcbf (patch)
tree44eb67c22873e1ce04b3bf51bc1f849a963c7a67 /t
parentMerge branch 'lw/perlish' (diff)
parentTeach "git clone" to pack refs (diff)
downloadtgif-01d8ff70f40d8be3c4e2efb245ffc3d013b7fcbf.tar.xz
Merge branch 'jh/clone-packed-refs'
* jh/clone-packed-refs: Teach "git clone" to pack refs Prepare testsuite for a "git clone" that packs refs Move pack_refs() and friends into libgit Incorporate fetched packs in future object traversal
Diffstat (limited to 't')
-rwxr-xr-xt/t5515-fetch-merge-logic.sh9
1 files changed, 6 insertions, 3 deletions
diff --git a/t/t5515-fetch-merge-logic.sh b/t/t5515-fetch-merge-logic.sh
index 3def75eeb2..8becbc3f38 100755
--- a/t/t5515-fetch-merge-logic.sh
+++ b/t/t5515-fetch-merge-logic.sh
@@ -142,9 +142,12 @@ do
set x $cmd; shift
git symbolic-ref HEAD refs/heads/$1 ; shift
rm -f .git/FETCH_HEAD
- rm -f .git/refs/heads/*
- rm -f .git/refs/remotes/rem/*
- rm -f .git/refs/tags/*
+ git for-each-ref \
+ refs/heads refs/remotes/rem refs/tags |
+ while read val type refname
+ do
+ git update-ref -d "$refname" "$val"
+ done
git fetch "$@" >/dev/null
cat .git/FETCH_HEAD
} >"$actual_f" &&