[git issue] git am failed for patches of converting the format of source codes from dos to unix

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



[git issue] git am failed for patches of converting the file format of
source codes from dos to unix

Git version: git version 2.23.0
Host PC: ubuntu 16.04.10
Reporter: Shuang Zheng

I have submitted a patch which convert the file format of source file
from dos to unix with command:
dos2unix misc/acrn-config/config_app/controller.py
then submit a patch with this change:
        git add controller.py
        git commit -m “change file format”
        git format-patch HEAD~1
        git am 0001-change-file-format.patch
errors as below:
Applying: change file format
error: patch failed: misc/acrn-config/config_app/controller.py:1
error: misc/acrn-config/config_app/controller.py: patch does not apply
Patch failed at 0001 fix format
hint: Use 'git am --show-current-patch' to see the failed patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".




[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]

  Powered by Linux