Merge branch 'cc/tests-without-assuming-ref-files-backend'
authorJunio C Hamano <gitster@pobox.com>
Mon, 25 Jun 2018 20:22:41 +0000 (13:22 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 25 Jun 2018 20:22:41 +0000 (13:22 -0700)
Instead of mucking with filesystem directly, use plumbing commands
update-ref etc. to manipulate the refs in the tests.

* cc/tests-without-assuming-ref-files-backend:
t9104: kosherly remove remote refs

t/t9104-git-svn-follow-parent.sh
index 9c49b6c1fe24335c6bcae777d60e14cdf96fd306..5e0ad1917736591b50e65169216bd5fe80193989 100755 (executable)
@@ -215,7 +215,9 @@ test_expect_success "multi-fetch continues to work" "
        "
 
 test_expect_success "multi-fetch works off a 'clean' repository" '
-       rm -rf "$GIT_DIR/svn" "$GIT_DIR/refs/remotes" &&
+       rm -rf "$GIT_DIR/svn" &&
+       git for-each-ref --format="option no-deref%0adelete %(refname)" refs/remotes |
+       git update-ref --stdin &&
        git reflog expire --all --expire=all &&
        mkdir "$GIT_DIR/svn" &&
        git svn multi-fetch