diff options
| author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2015-08-31 01:23:32 +0900 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2015-09-09 07:48:03 -0600 |
| commit | 8d3595a42b6bf1f04c08e093485c401677a6002a (patch) | |
| tree | 4446eef5406252e730a2b83ec25d9563468eae9e /tools | |
| parent | 468e81c405e5d14de4bc7b0d7a4a5540a576a45e (diff) | |
| download | u-boot-8d3595a42b6bf1f04c08e093485c401677a6002a.tar.gz | |
Revert "patman: use -D option for git format-patch"
This reverts commit 19b4a3369876f9215e2b861f211e8df1a75e26ca.
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>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/patman/gitutil.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/patman/gitutil.py b/tools/patman/gitutil.py index 67b086bd69..9e739d89b6 100644 --- a/tools/patman/gitutil.py +++ b/tools/patman/gitutil.py @@ -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() |