[linux] 01/02: Disable use of external diff in features/all/drm/genpatch.py

[debian-kernel at lists.debian.org]

This is an automated email from the git hooks/post-receive script.

benh pushed a commit to branch wheezy
in repository linux.

commit 12ec5a202eac6bd06705a982de33277e0c0f5982
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Mon Nov 23 16:27:17 2015 +0000

    Disable use of external diff in features/all/drm/genpatch.py
---
 debian/patches/features/all/drm/genpatch.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/patches/features/all/drm/genpatch.py b/debian/patches/features/all/drm/genpatch.py
index 824cade..ce7e0b5 100755
--- a/debian/patches/features/all/drm/genpatch.py
+++ b/debian/patches/features/all/drm/genpatch.py
@@ -10,7 +10,7 @@ from debian_linux.debian import Changelog, VersionLinux
 def main(repo, drm_version):
     changelog = Changelog(version=VersionLinux)[0]
 
-    args = ['git', 'diff',
+    args = ['git', 'diff', '--no-ext-diff',
             'v' + changelog.version.linux_upstream_full, 'v' + drm_version,
             '--', 'drivers/char/agp', 'drivers/gpu/drm', 'include/drm']
     with open('debian/patches/features/all/drm/drm-3.4.patch', 'w') as patch:

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git