git/list[1] front-page[2] threads[3] people[4] search[5] about
 

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

From
BZBeyondhorizon Zheng <byndhorizon@gmail.com>
Date
Sep 27, 2019, 07:31 UTC
Message-ID
<CAP2YDYhfA__VYe-Kt3FwjPMzJ1jVo8X9eQ-pHR4MhQWypkrkKQ@mail.gmail.com>

[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".
Next: Thomas Gummerer
Message 1 of 2 in “[git issue] git am failed for patches of converting the format of source codes from dos to unix”
  1. Beyondhorizon ZhengSep 27, 2019
  2. Thomas GummererSep 27, 2019

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.