Skip to content

Fixed: incorrect GIT format patches detection #39

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

Closed
pavelgood wants to merge 2 commits into from
Closed

Fixed: incorrect GIT format patches detection #39

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
158eeaa
Fixed: incorrect GIT format patches detection
pavelgood Nov 30, 2024
345eafa
Merge branch 'master' into master
uilianries Oct 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion patch_ng.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -706,8 +706,10 @@ def _detect_type(self, p):
if p.header[idx].startswith(b"diff --git"):
break
if p.header[idx].startswith(b'diff --git a/'):
# git-format-patch with --full-index generates full blob index, which is 40 symbols length
# shortcut index length may vary, seems to depend on the project size
if (idx+1 < len(p.header)
and re.match(b'(?:index \\w{7}..\\w{7} \\d{6}|new file mode \\d*)', p.header[idx+1])):
and re.match(b'(?:index \\w{7,40}..\\w{7,40} \\d{6}|new file mode \\d*)', p.header[idx+1])):
if DVCS:
return GIT

Expand Down