summaryrefslogtreecommitdiff
path: root/gbp/git
diff options
context:
space:
mode:
authorMarkus Lehtonen <markus.lehtonen@linux.intel.com>2013-07-17 19:13:42 +0300
committerGuido Günther <agx@sigxcpu.org>2013-09-05 12:03:02 +0200
commit3c0a022c975369362498f6e5a0c9417735ef2e7e (patch)
tree189ef96be176cacc61aef970cfa3c8cc8ddbef64 /gbp/git
parente48f0a09e8f13a024d8f51c08b3c2b25e886ac7b (diff)
GitRepository.diff: prevent usage of external diff
External diff might break patch generation, for example. Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Diffstat (limited to 'gbp/git')
-rw-r--r--gbp/git/repository.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/gbp/git/repository.py b/gbp/git/repository.py
index 2e8d779..e2f243b 100644
--- a/gbp/git/repository.py
+++ b/gbp/git/repository.py
@@ -1538,7 +1538,7 @@ class GitRepository(object):
@return: diff
@rtype: C{str}
"""
- options = GitArgs('-p')
+ options = GitArgs('-p', '--no-ext-diff')
if stat is True:
options.add('--stat')
elif stat: