summaryrefslogtreecommitdiff
path: root/t/t9104-git-svn-follow-parent.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-06-01 06:06:41 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-06-01 06:06:41 (GMT)
commitd6e5484208cb48d0b35e7b89b7f74c490c855754 (patch)
tree44d921d83015a86475e70d79da0044751aba9cfb /t/t9104-git-svn-follow-parent.sh
parentba928e974021570f96309a655981a7d10d82c430 (diff)
parent5340d4710700f0de378a49ac178a8c1873c316ad (diff)
downloadgit-d6e5484208cb48d0b35e7b89b7f74c490c855754.zip
git-d6e5484208cb48d0b35e7b89b7f74c490c855754.tar.gz
git-d6e5484208cb48d0b35e7b89b7f74c490c855754.tar.bz2
Merge branch 'cc/tests-without-assuming-ref-files-backend'
Quite a many tests assumed that newly created refs are made as loose refs using the files backend, which have been updated to use proper plumbing like rev-parse and update-ref, to avoid breakage once we start using different ref backends. * cc/tests-without-assuming-ref-files-backend: t990X: use '.git/objects' as 'deep inside .git' path t: make many tests depend less on the refs being files
Diffstat (limited to 't/t9104-git-svn-follow-parent.sh')
-rwxr-xr-xt/t9104-git-svn-follow-parent.sh3
1 files changed, 2 insertions, 1 deletions
diff --git a/t/t9104-git-svn-follow-parent.sh b/t/t9104-git-svn-follow-parent.sh
index a735fa3..9c49b6c 100755
--- a/t/t9104-git-svn-follow-parent.sh
+++ b/t/t9104-git-svn-follow-parent.sh
@@ -215,7 +215,8 @@ test_expect_success "multi-fetch continues to work" "
"
test_expect_success "multi-fetch works off a 'clean' repository" '
- rm -r "$GIT_DIR/svn" "$GIT_DIR/refs/remotes" "$GIT_DIR/logs" &&
+ rm -rf "$GIT_DIR/svn" "$GIT_DIR/refs/remotes" &&
+ git reflog expire --all --expire=all &&
mkdir "$GIT_DIR/svn" &&
git svn multi-fetch
'