1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
|
/*
* Copyright (C) 2010, 2013 Chris Aniszczyk <caniszczyk@gmail.com> and others
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Distribution License v. 1.0 which is available at
* https://www.eclipse.org/org/documents/edl-v10.php.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
package org.eclipse.jgit.api;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import java.io.File;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import org.eclipse.jgit.junit.JGitTestUtil;
import org.eclipse.jgit.junit.RepositoryTestCase;
import org.eclipse.jgit.lib.Constants;
import org.eclipse.jgit.lib.ObjectId;
import org.eclipse.jgit.lib.Ref;
import org.eclipse.jgit.lib.RefUpdate;
import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.lib.StoredConfig;
import org.eclipse.jgit.revwalk.RevCommit;
import org.eclipse.jgit.transport.FetchResult;
import org.eclipse.jgit.transport.RefSpec;
import org.eclipse.jgit.transport.RemoteConfig;
import org.eclipse.jgit.transport.TagOpt;
import org.eclipse.jgit.transport.TrackingRefUpdate;
import org.eclipse.jgit.transport.URIish;
import org.junit.Before;
import org.junit.Test;
public class FetchCommandTest extends RepositoryTestCase {
private Git git;
private Git remoteGit;
@Before
public void setupRemoteRepository() throws Exception {
git = new Git(db);
// create other repository
Repository remoteRepository = createWorkRepository();
remoteGit = new Git(remoteRepository);
// setup the first repository to fetch from the second repository
final StoredConfig config = db.getConfig();
RemoteConfig remoteConfig = new RemoteConfig(config, "test");
URIish uri = new URIish(remoteRepository.getDirectory().toURI().toURL());
remoteConfig.addURI(uri);
remoteConfig.update(config);
config.save();
}
@Test
public void testFetch() throws Exception {
// create some refs via commits and tag
RevCommit commit = remoteGit.commit().setMessage("initial commit").call();
Ref tagRef = remoteGit.tag().setName("tag").call();
git.fetch().setRemote("test")
.setRefSpecs("refs/heads/master:refs/heads/x").call();
assertEquals(commit.getId(),
db.resolve(commit.getId().getName() + "^{commit}"));
assertEquals(tagRef.getObjectId(),
db.resolve(tagRef.getObjectId().getName()));
}
@Test
public void testFetchHasRefLogForRemoteRef() throws Exception {
// create an initial commit SHA1 for the default branch
ObjectId defaultBranchSha1 = remoteGit.commit()
.setMessage("initial commit").call().getId();
git.fetch().setRemote("test")
.setRefSpecs("refs/heads/*:refs/remotes/origin/*").call();
List<Ref> allFetchedRefs = git.getRepository().getRefDatabase()
.getRefs();
assertEquals(allFetchedRefs.size(), 1);
Ref remoteRef = allFetchedRefs.get(0);
assertTrue(remoteRef.getName().startsWith(Constants.R_REMOTES));
assertEquals(defaultBranchSha1, remoteRef.getObjectId());
assertNotNull(git.getRepository().getRefDatabase()
.getReflogReader(remoteRef.getName()).getLastEntry());
}
@Test
public void testForcedFetch() throws Exception {
remoteGit.commit().setMessage("commit").call();
remoteGit.commit().setMessage("commit2").call();
git.fetch().setRemote("test")
.setRefSpecs("refs/heads/master:refs/heads/master").call();
remoteGit.commit().setAmend(true).setMessage("amended").call();
FetchResult res = git.fetch().setRemote("test")
.setRefSpecs("refs/heads/master:refs/heads/master").call();
assertEquals(RefUpdate.Result.REJECTED,
res.getTrackingRefUpdate("refs/heads/master").getResult());
res = git.fetch().setRemote("test")
.setRefSpecs("refs/heads/master:refs/heads/master")
.setForceUpdate(true).call();
assertEquals(RefUpdate.Result.FORCED,
res.getTrackingRefUpdate("refs/heads/master").getResult());
}
@Test
public void testFetchSimpleNegativeRefSpec() throws Exception {
remoteGit.commit().setMessage("commit").call();
FetchResult res = git.fetch().setRemote("test")
.setRefSpecs("refs/heads/master:refs/heads/test",
"^:refs/heads/test")
.call();
assertNull(res.getTrackingRefUpdate("refs/heads/test"));
res = git.fetch().setRemote("test")
.setRefSpecs("refs/heads/master:refs/heads/test",
"^refs/heads/master")
.call();
assertNull(res.getTrackingRefUpdate("refs/heads/test"));
}
@Test
public void negativeRefSpecFilterBySource() throws Exception {
remoteGit.commit().setMessage("commit").call();
remoteGit.branchCreate().setName("test").call();
remoteGit.commit().setMessage("commit1").call();
remoteGit.branchCreate().setName("dev").call();
FetchResult res = git.fetch().setRemote("test")
.setRefSpecs("refs/*:refs/origins/*", "^refs/*/test")
.call();
assertNotNull(res.getTrackingRefUpdate("refs/origins/heads/master"));
assertNull(res.getTrackingRefUpdate("refs/origins/heads/test"));
assertNotNull(res.getTrackingRefUpdate("refs/origins/heads/dev"));
}
@Test
public void negativeRefSpecFilterByDestination() throws Exception {
remoteGit.commit().setMessage("commit").call();
remoteGit.branchCreate().setName("meta").call();
remoteGit.commit().setMessage("commit1").call();
remoteGit.branchCreate().setName("data").call();
FetchResult res = git.fetch().setRemote("test")
.setRefSpecs("refs/*:refs/secret/*", "^:refs/secret/*/meta")
.call();
assertNotNull(res.getTrackingRefUpdate("refs/secret/heads/master"));
assertNull(res.getTrackingRefUpdate("refs/secret/heads/meta"));
assertNotNull(res.getTrackingRefUpdate("refs/secret/heads/data"));
}
@Test
public void fetchAddsBranches() throws Exception {
final String branch1 = "b1";
final String branch2 = "b2";
final String remoteBranch1 = "test/" + branch1;
final String remoteBranch2 = "test/" + branch2;
remoteGit.commit().setMessage("commit").call();
Ref branchRef1 = remoteGit.branchCreate().setName(branch1).call();
remoteGit.commit().setMessage("commit").call();
Ref branchRef2 = remoteGit.branchCreate().setName(branch2).call();
String spec = "refs/heads/*:refs/remotes/test/*";
git.fetch().setRemote("test").setRefSpecs(spec).call();
assertEquals(branchRef1.getObjectId(), db.resolve(remoteBranch1));
assertEquals(branchRef2.getObjectId(), db.resolve(remoteBranch2));
}
@Test
public void fetchDoesntDeleteBranches() throws Exception {
final String branch1 = "b1";
final String branch2 = "b2";
final String remoteBranch1 = "test/" + branch1;
final String remoteBranch2 = "test/" + branch2;
remoteGit.commit().setMessage("commit").call();
Ref branchRef1 = remoteGit.branchCreate().setName(branch1).call();
remoteGit.commit().setMessage("commit").call();
Ref branchRef2 = remoteGit.branchCreate().setName(branch2).call();
String spec = "refs/heads/*:refs/remotes/test/*";
git.fetch().setRemote("test").setRefSpecs(spec).call();
assertEquals(branchRef1.getObjectId(), db.resolve(remoteBranch1));
assertEquals(branchRef2.getObjectId(), db.resolve(remoteBranch2));
remoteGit.branchDelete().setBranchNames(branch1).call();
git.fetch().setRemote("test").setRefSpecs(spec).call();
assertEquals(branchRef1.getObjectId(), db.resolve(remoteBranch1));
assertEquals(branchRef2.getObjectId(), db.resolve(remoteBranch2));
}
@Test
public void fetchUpdatesBranches() throws Exception {
final String branch1 = "b1";
final String branch2 = "b2";
final String remoteBranch1 = "test/" + branch1;
final String remoteBranch2 = "test/" + branch2;
remoteGit.commit().setMessage("commit").call();
Ref branchRef1 = remoteGit.branchCreate().setName(branch1).call();
remoteGit.commit().setMessage("commit").call();
Ref branchRef2 = remoteGit.branchCreate().setName(branch2).call();
String spec = "refs/heads/*:refs/remotes/test/*";
git.fetch().setRemote("test").setRefSpecs(spec).call();
assertEquals(branchRef1.getObjectId(), db.resolve(remoteBranch1));
assertEquals(branchRef2.getObjectId(), db.resolve(remoteBranch2));
remoteGit.commit().setMessage("commit").call();
branchRef2 = remoteGit.branchCreate().setName(branch2).setForce(true).call();
git.fetch().setRemote("test").setRefSpecs(spec).call();
assertEquals(branchRef1.getObjectId(), db.resolve(remoteBranch1));
assertEquals(branchRef2.getObjectId(), db.resolve(remoteBranch2));
}
@Test
public void fetchPrunesBranches() throws Exception {
final String branch1 = "b1";
final String branch2 = "b2";
final String remoteBranch1 = "test/" + branch1;
final String remoteBranch2 = "test/" + branch2;
remoteGit.commit().setMessage("commit").call();
Ref branchRef1 = remoteGit.branchCreate().setName(branch1).call();
remoteGit.commit().setMessage("commit").call();
Ref branchRef2 = remoteGit.branchCreate().setName(branch2).call();
String spec = "refs/heads/*:refs/remotes/test/*";
git.fetch().setRemote("test").setRefSpecs(spec).call();
assertEquals(branchRef1.getObjectId(), db.resolve(remoteBranch1));
assertEquals(branchRef2.getObjectId(), db.resolve(remoteBranch2));
remoteGit.branchDelete().setBranchNames(branch1).call();
git.fetch().setRemote("test").setRefSpecs(spec)
.setRemoveDeletedRefs(true).call();
assertNull(db.resolve(remoteBranch1));
assertEquals(branchRef2.getObjectId(), db.resolve(remoteBranch2));
}
@Test
public void fetchShouldAutoFollowTag() throws Exception {
remoteGit.commit().setMessage("commit").call();
Ref tagRef = remoteGit.tag().setName("foo").call();
git.fetch().setRemote("test")
.setRefSpecs("refs/heads/*:refs/remotes/origin/*")
.setTagOpt(TagOpt.AUTO_FOLLOW).call();
assertEquals(tagRef.getObjectId(), db.resolve("foo"));
}
@Test
public void fetchShouldAutoFollowTagForFetchedObjects() throws Exception {
remoteGit.commit().setMessage("commit").call();
Ref tagRef = remoteGit.tag().setName("foo").call();
remoteGit.commit().setMessage("commit2").call();
git.fetch().setRemote("test")
.setRefSpecs("refs/heads/*:refs/remotes/origin/*")
.setTagOpt(TagOpt.AUTO_FOLLOW).call();
assertEquals(tagRef.getObjectId(), db.resolve("foo"));
}
@Test
public void fetchShouldNotFetchTagsFromOtherBranches() throws Exception {
remoteGit.commit().setMessage("commit").call();
remoteGit.checkout().setName("other").setCreateBranch(true).call();
remoteGit.commit().setMessage("commit2").call();
remoteGit.tag().setName("foo").call();
git.fetch().setRemote("test")
.setRefSpecs("refs/heads/master:refs/remotes/origin/master")
.setTagOpt(TagOpt.AUTO_FOLLOW).call();
assertNull(db.resolve("foo"));
}
@Test
public void fetchWithUpdatedTagShouldNotTryToUpdateLocal() throws Exception {
final String tagName = "foo";
remoteGit.commit().setMessage("commit").call();
Ref tagRef = remoteGit.tag().setName(tagName).call();
ObjectId originalId = tagRef.getObjectId();
String spec = "refs/heads/*:refs/remotes/origin/*";
git.fetch().setRemote("test").setRefSpecs(spec)
.setTagOpt(TagOpt.AUTO_FOLLOW).call();
assertEquals(originalId, db.resolve(tagName));
remoteGit.commit().setMessage("commit 2").call();
remoteGit.tag().setName(tagName).setForceUpdate(true).call();
FetchResult result = git.fetch().setRemote("test").setRefSpecs(spec)
.setTagOpt(TagOpt.AUTO_FOLLOW).call();
Collection<TrackingRefUpdate> refUpdates = result
.getTrackingRefUpdates();
assertEquals(1, refUpdates.size());
TrackingRefUpdate update = refUpdates.iterator().next();
assertEquals("refs/heads/master", update.getRemoteName());
assertEquals(originalId, db.resolve(tagName));
}
@Test
public void fetchWithExplicitTagsShouldUpdateLocal() throws Exception {
final String tagName = "foo";
remoteGit.commit().setMessage("commit").call();
Ref tagRef1 = remoteGit.tag().setName(tagName).call();
String spec = "refs/heads/*:refs/remotes/origin/*";
git.fetch().setRemote("test").setRefSpecs(spec)
.setTagOpt(TagOpt.AUTO_FOLLOW).call();
assertEquals(tagRef1.getObjectId(), db.resolve(tagName));
remoteGit.commit().setMessage("commit 2").call();
Ref tagRef2 = remoteGit.tag().setName(tagName).setForceUpdate(true)
.call();
FetchResult result = git.fetch().setRemote("test").setRefSpecs(spec)
.setTagOpt(TagOpt.FETCH_TAGS).call();
TrackingRefUpdate update = result.getTrackingRefUpdate(Constants.R_TAGS
+ tagName);
assertEquals(RefUpdate.Result.FORCED, update.getResult());
assertEquals(tagRef2.getObjectId(), db.resolve(tagName));
}
@Test
public void testFetchWithPruneShouldKeepOriginHead() throws Exception {
// Create a commit in the test repo.
commitFile("foo", "foo", "master");
// Produce a real clone of the git repo
Git cloned = Git.cloneRepository()
.setDirectory(createTempDirectory("testCloneRepository"))
.setURI("file://"
+ git.getRepository().getWorkTree().getAbsolutePath())
.call();
assertNotNull(cloned);
Repository clonedRepo = cloned.getRepository();
addRepoToClose(clonedRepo);
ObjectId originMasterId = clonedRepo
.resolve("refs/remotes/origin/master");
assertNotNull("Should have origin/master", originMasterId);
assertNotEquals("origin/master should not be zero ID",
ObjectId.zeroId(), originMasterId);
// Canonical git creates origin/HEAD; JGit (for now) doesn't. Let's
// pretend we did the clone via command-line git.
ObjectId originHeadId = clonedRepo.resolve("refs/remotes/origin/HEAD");
if (originHeadId == null) {
JGitTestUtil.write(
new File(clonedRepo.getDirectory(),
"refs/remotes/origin/HEAD"),
"ref: refs/remotes/origin/master\n");
originHeadId = clonedRepo.resolve("refs/remotes/origin/HEAD");
}
assertEquals("Should have origin/HEAD", originMasterId, originHeadId);
FetchResult result = cloned.fetch().setRemote("origin")
.setRemoveDeletedRefs(true).call();
assertTrue("Fetch after clone should be up-to-date",
result.getTrackingRefUpdates().isEmpty());
assertEquals("origin/master should still exist", originMasterId,
clonedRepo.resolve("refs/remotes/origin/master"));
assertEquals("origin/HEAD should be unchanged", originHeadId,
clonedRepo.resolve("refs/remotes/origin/HEAD"));
}
@Test
public void fetchAddRefsWithDuplicateRefspec() throws Exception {
final String branchName = "branch";
final String remoteBranchName = "test/" + branchName;
remoteGit.commit().setMessage("commit").call();
Ref branchRef = remoteGit.branchCreate().setName(branchName).call();
final String spec1 = "+refs/heads/*:refs/remotes/test/*";
final String spec2 = "refs/heads/*:refs/remotes/test/*";
final StoredConfig config = db.getConfig();
RemoteConfig remoteConfig = new RemoteConfig(config, "test");
remoteConfig.addFetchRefSpec(new RefSpec(spec1));
remoteConfig.addFetchRefSpec(new RefSpec(spec2));
remoteConfig.update(config);
git.fetch().setRemote("test").setRefSpecs(spec1).call();
assertEquals(branchRef.getObjectId(), db.resolve(remoteBranchName));
}
@Test
public void fetchPruneRefsWithDuplicateRefspec()
throws Exception {
final String branchName = "branch";
final String remoteBranchName = "test/" + branchName;
remoteGit.commit().setMessage("commit").call();
Ref branchRef = remoteGit.branchCreate().setName(branchName).call();
final String spec1 = "+refs/heads/*:refs/remotes/test/*";
final String spec2 = "refs/heads/*:refs/remotes/test/*";
final StoredConfig config = db.getConfig();
RemoteConfig remoteConfig = new RemoteConfig(config, "test");
remoteConfig.addFetchRefSpec(new RefSpec(spec1));
remoteConfig.addFetchRefSpec(new RefSpec(spec2));
remoteConfig.update(config);
git.fetch().setRemote("test").setRefSpecs(spec1).call();
assertEquals(branchRef.getObjectId(), db.resolve(remoteBranchName));
remoteGit.branchDelete().setBranchNames(branchName).call();
git.fetch().setRemote("test").setRefSpecs(spec1)
.setRemoveDeletedRefs(true).call();
assertNull(db.resolve(remoteBranchName));
}
@Test
public void fetchUpdateRefsWithDuplicateRefspec() throws Exception {
final String tagName = "foo";
remoteGit.commit().setMessage("commit").call();
Ref tagRef1 = remoteGit.tag().setName(tagName).call();
List<RefSpec> refSpecs = new ArrayList<>();
refSpecs.add(new RefSpec("+refs/heads/*:refs/remotes/origin/*"));
refSpecs.add(new RefSpec("+refs/tags/*:refs/tags/*"));
// Updating tags via the RefSpecs and setting TagOpt.FETCH_TAGS (or
// AUTO_FOLLOW) will result internally in *two* updates for the same
// ref.
git.fetch().setRemote("test").setRefSpecs(refSpecs)
.setTagOpt(TagOpt.AUTO_FOLLOW).call();
assertEquals(tagRef1.getObjectId(), db.resolve(tagName));
remoteGit.commit().setMessage("commit 2").call();
Ref tagRef2 = remoteGit.tag().setName(tagName).setForceUpdate(true)
.call();
FetchResult result = git.fetch().setRemote("test").setRefSpecs(refSpecs)
.setTagOpt(TagOpt.FETCH_TAGS).call();
assertEquals(2, result.getTrackingRefUpdates().size());
TrackingRefUpdate update = result
.getTrackingRefUpdate(Constants.R_TAGS + tagName);
assertEquals(RefUpdate.Result.FORCED, update.getResult());
assertEquals(tagRef2.getObjectId(), db.resolve(tagName));
}
}
|