FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

Use standard prefixes for parsed patch diffs by pick7 · Pull Request #2191 · gitpython-developers/GitPython · GitHub

  1. gitpython-developers
  2. GitPython

Repository navigation

Use standard prefixes for parsed patch diffs #2191

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Byron merged 1 commit into from
Jul 26, 2026
Conversation 2 Commits 1 Checks 48 Files changed
Merged

Use standard prefixes for parsed patch diffs #2191

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension .py  (3) All 1 file type selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
5 changes: 4 additions & 1 deletion git/diff.py
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,10 @@ def diff(
# END paths handling

kwargs["as_process"] = True
proc = diff_cmd(*self._process_diff_args(args), **kwargs)
args = self._process_diff_args(args)
if create_patch:
self.repo.git(c="diff.mnemonicPrefix=false")
proc = diff_cmd(*args, **kwargs)

diff_method = Diff._index_from_patch_format if create_patch else Diff._index_from_raw_format
index = diff_method(self.repo, proc)
Expand Down
2 changes: 2 additions & 0 deletions git/index/base.py
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -1547,6 +1547,8 @@ def diff(
args.extend(paths)

kwargs["as_process"] = True
if create_patch:
self.repo.git(c="diff.mnemonicPrefix=false")
proc = self.repo.git.diff(*args, **kwargs)

diff_method = (
Expand Down
20 changes: 20 additions & 0 deletions test/test_diff.py
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,26 @@ def test_diff_with_staged_file(self, rw_dir):
"This should work, but doesn't right now ... it's OK",
)

@with_rw_directory
def test_patch_diff_ignores_mnemonic_prefix(self, rw_dir):
repo = Repo.init(rw_dir)
filepath = osp.join(rw_dir, "file.txt")
with open(filepath, "w") as stream:
stream.write("initial\n")
repo.index.add([filepath])
repo.index.commit("initial")

with open(filepath, "w") as stream:
stream.write("changed\n")
repo.git.config("diff.mnemonicPrefix", "true")

self.assertEqual(len(repo.head.commit.diff(None, create_patch=True)), 1)
self.assertEqual(len(repo.index.diff(None, create_patch=True)), 1)

repo.index.add([filepath])
self.assertEqual(len(repo.index.diff(NULL_TREE, create_patch=True)), 1)
self.assertEqual(repo.git.config("--get", "diff.mnemonicPrefix"), "true")

def test_list_from_string_new_mode(self):
output = StringProcessAdapter(fixture("diff_new_mode"))
diffs = Diff._index_from_patch_format(self.rorepo, output)
Expand Down
Loading
Back | FazBrowse Home | New Git URL