gitpython-developers
diff --git a/‎git/diff.py‎
Lines changed: 1 addition & 1 deletion b/‎git/diff.py‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎test/test_diff.py‎
Lines changed: 33 additions & 19 deletions b/‎test/test_diff.py‎
Lines changed: 33 additions & 19 deletions
@@ -371,7 +371,7 @@ class Diff:
 
     # Precompiled regex.
     # Note: The path prefixes support both default (a/b) and mnemonicPrefix mode
-    # which can use prefixes like c/ (commit), w/ (worktree), i/ (index), o/ (object)
+    # which can use prefixes like c/ (commit), w/ (worktree), i/ (index), o/ (object), and h/ (HEAD)
     re_header = re.compile(
         rb"""
                                 ^diff[ ]--git
 
@@ -290,28 +290,42 @@ def test_diff_mnemonic_prefix(self):
         - w/ for worktree
         - i/ for index
         - o/ for object
+        - h/ for HEAD
 
         This addresses issue #2013 where the regex only matched [ab]/ prefixes.
         """
-        # Create a diff with mnemonicPrefix-style c/ and w/ prefixes
-        # Using valid 40-char hex SHAs
-        diff_mnemonic = b"""diff --git c/.vscode/launch.json w/.vscode/launch.json
-index 1234567890abcdef1234567890abcdef12345678..abcdef1234567890abcdef1234567890abcdef12 100644
---- c/.vscode/launch.json
-+++ w/.vscode/launch.json
-@@ -1,3 +1,3 @@
--old content
-+new content
-"""
-        diff_proc = StringProcessAdapter(diff_mnemonic)
-        diffs = Diff._index_from_patch_format(self.rorepo, diff_proc)
-
-        # Should parse successfully (previously would fail or return empty)
-        self.assertEqual(len(diffs), 1)
-        diff = diffs[0]
-        # The path should be extracted correctly (without the c/ or w/ prefix)
-        self.assertEqual(diff.a_path, ".vscode/launch.json")
-        self.assertEqual(diff.b_path, ".vscode/launch.json")
+        # Test all mnemonicPrefix combinations
+        # Each tuple is (a_prefix, b_prefix) representing different comparison types
+        prefix_pairs = [
+            (b"c/", b"w/"),  # commit vs worktree
+            (b"c/", b"i/"),  # commit vs index
+            (b"i/", b"w/"),  # index vs worktree
+            (b"o/", b"w/"),  # object vs worktree
+            (b"h/", b"i/"),  # HEAD vs index
+            (b"h/", b"w/"),  # HEAD vs worktree
+        ]
+
+        for a_prefix, b_prefix in prefix_pairs:
+            with self.subTest(a_prefix=a_prefix, b_prefix=b_prefix):
+                diff_mnemonic = (
+                    b"diff --git " + a_prefix + b".vscode/launch.json " + b_prefix + b".vscode/launch.json\n"
+                    b"index 1234567890abcdef1234567890abcdef12345678.."
+                    b"abcdef1234567890abcdef1234567890abcdef12 100644\n"
+                    b"--- " + a_prefix + b".vscode/launch.json\n"
+                    b"+++ " + b_prefix + b".vscode/launch.json\n"
+                    b"@@ -1,3 +1,3 @@\n"
+                    b"-old content\n"
+                    b"+new content\n"
+                )
+                diff_proc = StringProcessAdapter(diff_mnemonic)
+                diffs = Diff._index_from_patch_format(self.rorepo, diff_proc)
+
+                # Should parse successfully (previously would fail or return empty)
+                self.assertEqual(len(diffs), 1)
+                diff = diffs[0]
+                # The path should be extracted correctly (without the prefix)
+                self.assertEqual(diff.a_path, ".vscode/launch.json")
+                self.assertEqual(diff.b_path, ".vscode/launch.json")
 
     def test_diff_patch_format(self):
         # Test all of the 'old' format diffs for completeness - it should at least be