* core.autocrlf and merge conflict output
@ 2008-06-22 22:08 Edward Z. Yang
2008-06-23 0:45 ` Junio C Hamano
0 siblings, 1 reply; 6+ messages in thread
From: Edward Z. Yang @ 2008-06-22 22:08 UTC (permalink / raw)
To: git
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Apparently, the conflict information Git writes to the working copy
during merge doesn't respect core.autocrlf, magically converting files
to LF and causing problems when you try to commit the files, when
core.safecrlf is on.
I'm in the process of making a patch, but I'm having difficulty getting
builtin-merge-file.c and convert.c to play together. Part of the problem
is the lack of documentation in convert.c, which I'd also like to fix
(but in a different patch).
So, here's an appeal to the Git gods:
* Should I even bother trying to document this? While good docs are
always a definite plus, poor documentation can hurt code.
* Would crlf_to_worktree (apparently an internal function) or
convert_to_working_tree be more appropriate for this task?
* Where can I get a sensible value for *path in convert.c from
builtin-merge-file.c?
Thanks!
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.7 (MingW32)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org
iD8DBQFIXs17qTO+fYacSNoRAuAEAJ9LekfdUzU8WjbYxdhDOLaUfN67HACgg6gR
3kpT/5CbV3X7bbfkwJFDpAI=
=lega
-----END PGP SIGNATURE-----
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: core.autocrlf and merge conflict output
2008-06-22 22:08 core.autocrlf and merge conflict output Edward Z. Yang
@ 2008-06-23 0:45 ` Junio C Hamano
2008-06-23 1:47 ` Edward Z. Yang
0 siblings, 1 reply; 6+ messages in thread
From: Junio C Hamano @ 2008-06-23 0:45 UTC (permalink / raw)
To: Edward Z. Yang; +Cc: git
"Edward Z. Yang" <edwardzyang@thewritingpot.com> writes:
> Apparently, the conflict information Git writes to the working copy
> during merge doesn't respect core.autocrlf,...
Is this an old news before 249c61a (merge-recursive: respect core.autocrlf
when writing out the result, 2008-06-09) happened?
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: core.autocrlf and merge conflict output
2008-06-23 0:45 ` Junio C Hamano
@ 2008-06-23 1:47 ` Edward Z. Yang
2008-06-23 1:54 ` Junio C Hamano
2008-06-23 2:00 ` Johannes Schindelin
0 siblings, 2 replies; 6+ messages in thread
From: Edward Z. Yang @ 2008-06-23 1:47 UTC (permalink / raw)
To: git
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Junio C Hamano wrote:
> Is this an old news before 249c61a (merge-recursive: respect core.autocrlf
> when writing out the result, 2008-06-09) happened?
Apparently, yes. :o) Thus are the perils of working off a "downstream"
branch. I'll go bug the git/mingw/4msysgit.git maintainers to get this
change merged in. Thanks!
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.7 (MingW32)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org
iD8DBQFIXwC4qTO+fYacSNoRAi8RAJ4/ZF0C0XB9QSPgCnQYae/33YSRUgCff/y5
5Dd9vy/pQQsNJbyQ+xfc4lY=
=fyGn
-----END PGP SIGNATURE-----
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: core.autocrlf and merge conflict output
2008-06-23 1:47 ` Edward Z. Yang
@ 2008-06-23 1:54 ` Junio C Hamano
2008-06-23 2:00 ` Johannes Schindelin
1 sibling, 0 replies; 6+ messages in thread
From: Junio C Hamano @ 2008-06-23 1:54 UTC (permalink / raw)
To: Edward Z. Yang; +Cc: git
"Edward Z. Yang" <edwardzyang@thewritingpot.com> writes:
> Junio C Hamano wrote:
>> Is this an old news before 249c61a (merge-recursive: respect core.autocrlf
>> when writing out the result, 2008-06-09) happened?
>
> Apparently, yes. :o) Thus are the perils of working off a "downstream"
> branch. I'll go bug the git/mingw/4msysgit.git maintainers to get this
> change merged in. Thanks!
Did cherry-picking that particular commit locally fixes the issue for you?
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: core.autocrlf and merge conflict output
2008-06-23 1:47 ` Edward Z. Yang
2008-06-23 1:54 ` Junio C Hamano
@ 2008-06-23 2:00 ` Johannes Schindelin
2008-06-23 2:23 ` Edward Z. Yang
1 sibling, 1 reply; 6+ messages in thread
From: Johannes Schindelin @ 2008-06-23 2:00 UTC (permalink / raw)
To: Edward Z. Yang; +Cc: git
Hi,
On Sun, 22 Jun 2008, Edward Z. Yang wrote:
> Junio C Hamano wrote:
> > Is this an old news before 249c61a (merge-recursive: respect
> > core.autocrlf when writing out the result, 2008-06-09) happened?
>
> Apparently, yes. :o) Thus are the perils of working off a "downstream"
> branch. I'll go bug the git/mingw/4msysgit.git maintainers to get this
> change merged in. Thanks!
Funny. And I thought 1.5.6 contained that patch... Because 1.5.6 was
merged by Steffen recently, and announced on both the msysgit list as well
as this one.
Ciao,
Dscho
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: core.autocrlf and merge conflict output
2008-06-23 2:00 ` Johannes Schindelin
@ 2008-06-23 2:23 ` Edward Z. Yang
0 siblings, 0 replies; 6+ messages in thread
From: Edward Z. Yang @ 2008-06-23 2:23 UTC (permalink / raw)
To: git; +Cc: Johannes.Schindelin
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Johannes Schindelin wrote:
> Funny. And I thought 1.5.6 contained that patch... Because 1.5.6 was
> merged by Steffen recently, and announced on both the msysgit list as well
> as this one.
And I'm wrong once again. My git checkout was on a detached head and
wasn't updating (apparently, I'm no good at reading error messages).
Switching back to master, pulling and then re-compiling fixed it.
While 99% of this is my fault, there might be a bug in netinstall.
However, I'm going to take that one to the msysgit list.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.7 (MingW32)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org
iD8DBQFIXwk/qTO+fYacSNoRAkIhAJ9LU6jH5ThQbu0tSjmkbp7ynEyh5wCdHvbJ
pFVPllbiXjfLrgEYuY+uVlM=
=ZxbH
-----END PGP SIGNATURE-----
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2008-06-23 2:25 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-06-22 22:08 core.autocrlf and merge conflict output Edward Z. Yang
2008-06-23 0:45 ` Junio C Hamano
2008-06-23 1:47 ` Edward Z. Yang
2008-06-23 1:54 ` Junio C Hamano
2008-06-23 2:00 ` Johannes Schindelin
2008-06-23 2:23 ` Edward Z. Yang
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).