t5510: prepare test refs more straightforwardly
"git fetch" was being used with contrived refspecs to create tags and remote-tracking branches in test repositories in preparation for the actual tests. This is obscure and also makes one wonder whether this is indeed just preparation or whether some side-effect of "git fetch" is being tested. So use the more straightforward commands "git tag" / "git update-ref" when preparing branches in test repositories. Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Michael Haggerty committed
Oct 23, 2013 at 17:50 UTC
d0d06e892a1a7bc6a1dfd76374da09f0170cae2c
1 file changed
+4
-4
t/t5510-fetch.sh
+4
-4
@@ -88,7 +88,7 @@ test_expect_success 'fetch --prune on its own works as expected' '
88
cd "$D" &&
89
git clone . prune &&
90
cd prune &&
91
- git fetch origin refs/heads/master:refs/remotes/origin/extrabranch &&
91
+ git update-ref refs/remotes/origin/extrabranch master &&
92
93
git fetch --prune origin &&
94
test_must_fail git rev-parse origin/extrabranch
@@ -98,7 +98,7 @@ test_expect_success 'fetch --prune with a branch name keeps branches' '
98
cd "$D" &&
99
git clone . prune-branch &&
100
cd prune-branch &&
101
- git fetch origin refs/heads/master:refs/remotes/origin/extrabranch &&
101
+ git update-ref refs/remotes/origin/extrabranch master &&
102
103
git fetch --prune origin master &&
104
git rev-parse origin/extrabranch
@@ -117,7 +117,7 @@ test_expect_success 'fetch --prune --tags does not delete the remote-tracking br
117
cd "$D" &&
118
git clone . prune-tags &&
119
cd prune-tags &&
120
- git fetch origin refs/heads/master:refs/tags/sometag &&
120
+ git tag sometag master &&
121
122
git fetch --prune --tags origin &&
123
git rev-parse origin/master &&
@@ -128,7 +128,7 @@ test_expect_success 'fetch --prune --tags with branch does not delete other remo
128
cd "$D" &&
129
git clone . prune-tags-branch &&
130
cd prune-tags-branch &&
131
- git fetch origin refs/heads/master:refs/remotes/origin/extrabranch &&
131
+ git update-ref refs/remotes/origin/extrabranch master &&
132
133
git fetch --prune --tags origin master &&
134
git rev-parse origin/extrabranch