Commit 8d3595a4 authored by Masahiro Yamada's avatar Masahiro Yamada Committed by Simon Glass

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

This reverts commit 19b4a336.

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: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
Acked-by: default avatarSimon Glass <sjg@chromium.org>
parent 468e81c4
......@@ -264,7 +264,7 @@ def CreatePatches(start, count, series):
"""
if series.get('version'):
version = '%s ' % series['version']
cmd = ['git', 'format-patch', '-D', '-M', '--signoff']
cmd = ['git', 'format-patch', '-M', '--signoff']
if series.get('cover'):
cmd.append('--cover-letter')
prefix = series.GetPatchPrefix()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment