aboutsummaryrefslogtreecommitdiffhomepage
path: root/gbp/scripts/common
diff options
context:
space:
mode:
authorGuido Günther <agx@sigxcpu.org>2017-05-26 16:30:29 +0200
committerGuido Günther <agx@sigxcpu.org>2017-05-26 16:30:29 +0200
commit762ebe190b3a48df20f0b4bdce399819db65ff89 (patch)
tree05175b8732c7c3b6712e86510b455ea0842bdad5 /gbp/scripts/common
parent96cd17dfd1e4dc51a1172f7cb0b9b718c6a05c48 (diff)
pq: Disable rename tracking
to produce diff compatible patches
Diffstat (limited to 'gbp/scripts/common')
-rw-r--r--gbp/scripts/common/pq.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/gbp/scripts/common/pq.py b/gbp/scripts/common/pq.py
index 0225a97e..61ea42c5 100644
--- a/gbp/scripts/common/pq.py
+++ b/gbp/scripts/common/pq.py
@@ -227,7 +227,7 @@ def format_patch(outdir, repo, commit_info, series, numbered=True,
patch = None
if paths:
diff = repo.diff('%s^!' % commit_info['id'], paths=paths, stat=80,
- summary=True, text=True, abbrev=7)
+ summary=True, text=True, abbrev=7, renames=False)
patch = write_patch_file(filepath, commit_info, diff)
if patch:
series.append(patch)
@@ -252,7 +252,7 @@ def format_diff(outdir, filename, repo, start, end, path_exclude_regex=None):
paths = patch_path_filter(file_status, path_exclude_regex)
if paths:
diff = repo.diff(start, end, paths=paths, stat=80, summary=True,
- text=True, abbrev=7)
+ text=True, abbrev=7, renames=False)
return write_patch_file(filename, info, diff)
return None