From: Johannes Berg Date: Thu, 4 Apr 2013 22:28:42 +0000 (+0200) Subject: gentree: add -p option to diff when refreshing patches X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=a7a2e992aa2e563c8adb2dec6ddd6e53b1cd9872;p=openwrt%2Fstaging%2Fblogic.git gentree: add -p option to diff when refreshing patches This generally makes patches more readable to humans and has no impact on the tools. Signed-off-by: Johannes Berg --- diff --git a/gentree.py b/gentree.py index ad1240cd6657..51959fd3fdcf 100755 --- a/gentree.py +++ b/gentree.py @@ -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,