diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-06-25 13:18:54 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-06-25 13:18:54 -0700 |
| commit | 01d8ff70f40d8be3c4e2efb245ffc3d013b7fcbf (patch) | |
| tree | 44eb67c22873e1ce04b3bf51bc1f849a963c7a67 /t | |
| parent | 14f0e48db7e1b0c5ec1b831f47214b972b4582d4 (diff) | |
| parent | 3e8aded20329bef35470eb469281f6b275d19dea (diff) | |
| download | git-01d8ff70f40d8be3c4e2efb245ffc3d013b7fcbf.tar.gz git-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-x | t/t5515-fetch-merge-logic.sh | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/t/t5515-fetch-merge-logic.sh b/t/t5515-fetch-merge-logic.sh index 3def75eeb..8becbc3f3 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" && |