Merge pull request #1044 from jelmer/follow-ref-fix

Catch SymrefLoop in set_if_equals
jelmer · Sep 16, 2022 · 9bb4312 · 9bb4312
2 parents 9051030 + fcae731
commit 9bb4312
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/NEWS b/NEWS
@@ -1,5 +1,8 @@
 0.20.47	UNRELEASED
 
+ * Fix handling of SymrefLoop in RefsContainer.__setitem__.
+   (Dominic Davis-Foster, Jelmer Vernooĳ)
+
 0.20.46	2022-09-06
 
  * Apply insteadOf to rsync-style location strings

diff --git a/dulwich/refs.py b/dulwich/refs.py
@@ -835,7 +835,7 @@ def set_if_equals(
         try:
             realnames, _ = self.follow(name)
             realname = realnames[-1]
-        except (KeyError, IndexError):
+        except (KeyError, IndexError, SymrefLoop):
             realname = name
         filename = self.refpath(realname)
 

diff --git a/dulwich/tests/test_refs.py b/dulwich/tests/test_refs.py
@@ -521,6 +521,14 @@ def test_follow(self):
         )
         self.assertRaises(SymrefLoop, self._refs.follow, b"refs/heads/loop")
 
+    def test_set_overwrite_loop(self):
+        self.assertRaises(SymrefLoop, self._refs.follow, b"refs/heads/loop")
+        self._refs[b'refs/heads/loop'] = (
+            b"42d06bd4b77fed026b154d16493e5deab78f02ec")
+        self.assertEqual(
+            ([b'refs/heads/loop'], b'42d06bd4b77fed026b154d16493e5deab78f02ec'),
+            self._refs.follow(b"refs/heads/loop"))
+
     def test_delitem(self):
         RefsContainerTests.test_delitem(self)
         ref_file = os.path.join(self._refs.path, b"refs", b"heads", b"master")