Skip to content
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.

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

Enable user to override default diff -M arg #1551

Merged
merged 4 commits into from
Feb 2, 2023
Merged
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 4 additions & 1 deletion git/diff.py
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,10 @@ def diff(
args.append("--abbrev=40") # we need full shas
args.append("--full-index") # get full index paths, not only filenames

args.append("-M") # check for renames, in both formats
# remove default '-M' arg (check for renames) if user is overriding it
if not any(x in kwargs for x in ('find_renames', 'no_renames', 'M')):
args.append("-M")

if create_patch:
args.append("-p")
else:
Expand Down