Fix test-only issue with git 2.20 or later handling a clobbered tag · og-python-scripts/GitPython@dff4bdd · GitHub

1. og-python-scripts
2. GitPython

Repository navigation

• Code
• Pull requests
• Actions
• Projects
• Security and quality
• Insights

Commit dff4bdd

Browse filesBrowse the repository at this point in the historyBrowse files

jeking3

authored and

Byron

committed

Fix test-only issue with git 2.20 or later handling a clobbered tag

1 parent 7a6ca8c commit dff4bdd
Copy full SHA for dff4bdd

1 file changed

+8-2Lines changed: 8 additions & 2 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• git/test
  • test_remote.py

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎git/test/test_remote.py‎

Copy file name to clipboardExpand all lines: git/test/test_remote.py

+8-2Lines changed: 8 additions & 2 deletions

Original file line number	Diff line number	Diff line change
@@ -253,9 +253,15 @@ def get_info(res, remote, name):
253	253	self.assertEqual(tinfo.ref.commit, rtag.commit)
254	254	self.assertTrue(tinfo.flags & tinfo.NEW_TAG)
255	255
256		- # adjust tag commit
	256	+ # adjust the local tag commit
257	257	Reference.set_object(rtag, rhead.commit.parents[0].parents[0])
258		- res = fetch_and_test(remote, tags=True)
	258	+
	259	+ # as of git 2.20 one cannot clobber local tags that have changed without
	260	+ # specifying --force, and the test assumes you can clobber, so...
	261	+ force = None
	262	+ if rw_repo.git.version_info[:2] >= (2, 20):
	263	+ force = True
	264	+ res = fetch_and_test(remote, tags=True, force=force)
259	265	tinfo = res[str(rtag)]
260	266	self.assertEqual(tinfo.commit, rtag.commit)
261	267	self.assertTrue(tinfo.flags & tinfo.TAG_UPDATE)

0 commit comments

Comments

0 (0)