diff options
author | Cesar Velazquez <cesar.velazquez@disney.com> | 2023-01-30 15:57:54 -0800 |
---|---|---|
committer | Cesar Velazquez <cesar.velazquez@disney.com> | 2023-01-30 15:57:54 -0800 |
commit | 22f515824408b502e285c80bf2da038aae5af254 (patch) | |
tree | 7fc1631210bded88ceb3ab1172c0d3ff191bd6ff /git/diff.py | |
parent | 63a60b3824ac7b756034ca50a6b0bbc61602a358 (diff) | |
download | gitpython-22f515824408b502e285c80bf2da038aae5af254.tar.gz |
Enable user to override default diff -M arg
Diffstat (limited to 'git/diff.py')
-rw-r--r-- | git/diff.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/git/diff.py b/git/diff.py index c4424592..79b02f12 100644 --- a/git/diff.py +++ b/git/diff.py @@ -144,7 +144,10 @@ class Diffable(object): 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: |