* Using format-patch and apply against files with CRLF line endings
@ 2011-04-20 11:48 Steven E. Harris
2011-04-20 15:59 ` Jay Soffian
0 siblings, 1 reply; 2+ messages in thread
From: Steven E. Harris @ 2011-04-20 11:48 UTC (permalink / raw)
To: git
Is it the case that format-patch will always emit text with LF line
endings, or is it respecting whatever the host platform considers to be
the proper line ending? Is the line ending in use configurable?
I ask because I see that git-p4 uses format-patch and apply internally
to apply changes against files in the Perforce workspace, and those
files have CRLF line endings, but it looks like format-patch is emitting
patches with LF line endings, and none of those patches will apply
cleanly.
Perhaps I just need to pipe the output from format-patch through
unix2dos before feeding it to apply, but I'm wondering whether I'm
barking up the wrong tree here.
--
Steven E. Harris
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: Using format-patch and apply against files with CRLF line endings
2011-04-20 11:48 Using format-patch and apply against files with CRLF line endings Steven E. Harris
@ 2011-04-20 15:59 ` Jay Soffian
0 siblings, 0 replies; 2+ messages in thread
From: Jay Soffian @ 2011-04-20 15:59 UTC (permalink / raw)
To: Steven E. Harris; +Cc: git
On Wed, Apr 20, 2011 at 7:48 AM, Steven E. Harris <seh@panix.com> wrote:
> Is it the case that format-patch will always emit text with LF line
> endings, or is it respecting whatever the host platform considers to be
> the proper line ending? Is the line ending in use configurable?
>
> I ask because I see that git-p4 uses format-patch and apply internally
> to apply changes against files in the Perforce workspace, and those
> files have CRLF line endings, but it looks like format-patch is emitting
> patches with LF line endings, and none of those patches will apply
> cleanly.
>
> Perhaps I just need to pipe the output from format-patch through
> unix2dos before feeding it to apply, but I'm wondering whether I'm
> barking up the wrong tree here.
The patch emitted by format-patch should have the correct (original)
line-endings, but to preserve them when the patch is applied, git-am
needs to be called with --keep-cr (also see config option
'am.keepcr').
j.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-04-20 16:00 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-04-20 11:48 Using format-patch and apply against files with CRLF line endings Steven E. Harris
2011-04-20 15:59 ` Jay Soffian
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 NNTP newsgroup(s).