GitRepository.diff: prevent usage of external diff
authorMarkus Lehtonen <markus.lehtonen@linux.intel.com>
Wed, 17 Jul 2013 16:13:42 +0000 (19:13 +0300)
committerGuido Günther <agx@sigxcpu.org>
Thu, 5 Sep 2013 10:03:02 +0000 (12:03 +0200)
External diff might break patch generation, for example.

Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
gbp/git/repository.py

index 2e8d77964433eef74201eb4906d5fe096a6e0b05..e2f243ba4815ef704208d93bd313b9d0f75f602a 100644 (file)
@@ -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: