[U-Boot] [PATCH] Revert "patman: use -D option for git format-patch"

Simon Glass sjg at chromium.org
Tue Sep 1 02:32:33 CEST 2015


On 30 August 2015 at 16:47, Simon Glass <sjg at chromium.org> wrote:
> Hi Masahiro,
>
> On 30 August 2015 at 10:23, Masahiro Yamada
> <yamada.masahiro at socionext.com> wrote:
>> 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 at socionext.com>
>> ---
>>
>>  tools/patman/gitutil.py | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> Oh dear. That explains the errors patman has been giving me lately.
>
> Acked-by: Simon Glass <sjg at chromium.org>

Applied to u-boot-x86, thanks!


More information about the U-Boot mailing list