gentree: add -p option to diff when refreshing patches
authorJohannes Berg <johannes.berg@intel.com>
Thu, 4 Apr 2013 22:28:42 +0000 (00:28 +0200)
committerJohannes Berg <johannes.berg@intel.com>
Thu, 4 Apr 2013 22:28:42 +0000 (00:28 +0200)
This generally makes patches more readable to humans
and has no impact on the tools.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
gentree.py

index ad1240cd6657a87afe343224108dc71f72c58dd9..51959fd3fdcfc5fcab9c1c4ef51d54e0e6c401df 100755 (executable)
@@ -341,7 +341,7 @@ def process(kerneldir, outdir, copy_list_file, git_revision=None,
                 for patchitem in p.items:
                     patched_file = '/'.join(patchitem.source.split('/')[1:])
                     fullfn = os.path.join(args.outdir, patched_file)
-                    process = subprocess.Popen(['diff', '-u', patched_file + '.orig_file', patched_file,
+                    process = subprocess.Popen(['diff', '-p', '-u', patched_file + '.orig_file', patched_file,
                                                 '--label', 'a/' + patched_file,
                                                 '--label', 'b/' + patched_file],
                                                stdout=pfilef, close_fds=True,