* [git issue] git am failed for patches of converting the format of source codes from dos to unix
@ 2019-09-27 7:31 Beyondhorizon Zheng
2019-09-27 9:25 ` Thomas Gummerer
0 siblings, 1 reply; 2+ messages in thread
From: Beyondhorizon Zheng @ 2019-09-27 7:31 UTC (permalink / raw)
To: git
[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".
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [git issue] git am failed for patches of converting the format of source codes from dos to unix
2019-09-27 7:31 [git issue] git am failed for patches of converting the format of source codes from dos to unix Beyondhorizon Zheng
@ 2019-09-27 9:25 ` Thomas Gummerer
0 siblings, 0 replies; 2+ messages in thread
From: Thomas Gummerer @ 2019-09-27 9:25 UTC (permalink / raw)
To: Beyondhorizon Zheng; +Cc: git
On 09/27, Beyondhorizon Zheng wrote:
> [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
Here you are preparing a patch of your last commit. Good.
> git am 0001-change-file-format.patch
Running this right after 'git format-patch' will try to apply the
patch, but your latest commit already includes those changes. So
there is nothing to apply, and 'git am' fails. Normally you would not
use 'format-patch' and then try to apply the patch again, but rather
send it to someone else, who could then apply your changes.
You could use 'git am -3 0001-change-file-format.patch', which falls
back to a three-way merge, which should tell you something like:
No changes -- Patch already applied.
If you want to check that the patch applies correctly, you can use
'git reset --hard HEAD~1' (make sure you don't have any untracked
changes you don't want to loose first), and then use the 'git am'
command from above.
Hope that helps.
> 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".
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-09-27 9:25 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-09-27 7:31 [git issue] git am failed for patches of converting the format of source codes from dos to unix Beyondhorizon Zheng
2019-09-27 9:25 ` Thomas Gummerer
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).