Skip to content

Commit 4379c31

Browse files
codexByron
authored andcommitted
Reset reconstructed dependency fixture branches
GitPython tests used the former submodules as clonable gitdb and smmap repositories. Reconstructing those fixtures from a shared clone of the merged history initially inherited GitPython's master branch and tag namespace, causing branch and tag creation collisions. Force the fixture branch and historical smmap tag to the imported source tips so the reconstructed repositories have the same refs the existing tests expect.
1 parent a2794e0 commit 4379c31

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

test/lib/helper.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -408,7 +408,7 @@ def setUpClass(cls):
408408
}.items():
409409
path = osp.join(cls._dependency_repo_root, name)
410410
repo = cls.rorepo.clone(path, shared=True, no_checkout=True)
411-
repo.create_head("master", repo.commit(rev)).checkout()
411+
repo.create_head("master", repo.commit(rev), force=True).checkout()
412412
if name == "smmap":
413413
repo.create_tag("v0.8.1", ref="master~10", message="Test fixture tag")
414414
repo.close()

0 commit comments

Comments
 (0)