LM
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "patman: use -D option for git format-patch" 

This reverts commit 19b4a33698.

Since that commit, patman generates useless patches for file removal;
"git format -D" prints only the header but not the diff when deleting
files, and "git am" always refuses such patches.

The following is the quotation from "man git-format-patch":

  -D, --irreversible-delete
    Omit the preimage for deletes, i.e. print only the header but
    not the diff between the preimage and /dev/null. The resulting
    patch is not meant to be applied with patch nor git apply; this
    is solely for people who want to just concentrate on reviewing
    the text after the change. In addition, the output obviously
    lack enough information to apply such a patch in reverse, even
    manually, hence the name of the option.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Acked-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Masahiro Yamada 2015-08-31 01:23:32 +09:00 committed by Simon Glass
parent 468e81c405
commit 8d3595a42b
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/patman/gitutil.py
View File

@ -264,7 +264,7 @@ def CreatePatches(start, count, series):
""" """
if series.get('version'): if series.get('version'):
version = '%s ' % series['version'] version = '%s ' % series['version']
cmd = ['git', 'format-patch', '-D', '-M', '--signoff'] cmd = ['git', 'format-patch', '-M', '--signoff']
if series.get('cover'): if series.get('cover'):
cmd.append('--cover-letter') cmd.append('--cover-letter')
prefix = series.GetPatchPrefix() prefix = series.GetPatchPrefix()