All of lore.kernel.org
 help / color / mirror / Atom feed
From: Erik Faye-Lund <kusmabite@googlemail.com>
To: Eric Wong <normalperson@yhbt.net>
Cc: git <git@vger.kernel.org>,
	"johannes.schindelin" <johannes.schindelin@gmx.de>
Subject: Re: [PATCH 2/2] git-svn: support fetch with autocrlf on
Date: Sat, 13 Feb 2010 15:16:52 +0100	[thread overview]
Message-ID: <40aa078e1002130616u478397c0xf757d5424630e6cf@mail.gmail.com> (raw)
In-Reply-To: <20100213122532.GA31653@dcvr.yhbt.net>

On Sat, Feb 13, 2010 at 1:25 PM, Eric Wong <normalperson@yhbt.net> wrote:
> Erik Faye-Lund <kusmabite@googlemail.com> wrote:
>> If I enable core.autocrlf and perform a "git svn rebase" that fetches
>> a change containing CRLFs, the git-svn meta-data gets corrupted.
>>
>> Commit d3c9634e worked around this by setting core.autocrlf to "false"
>> in the per-repo config when initing the clone. However if the config
>> variable was changed, the breakage would still occur. This made it
>> painful to work with git-svn on repos with mostly checked in LFs on
>> Windows.
>>
>> This patch tries to fix the same problem while allowing core.autocrlf
>> to be enabled, by disabling filters when when hashing.
>>
>> git-svn is currently the only call-site for hash_and_insert_object
>> (apart from the test-suite), so changing it should be safe.
>>
>> Signed-off-by: Erik Faye-Lund <kusmabite@gmail.com>
>> ---
>>
>> With this patch applied, I guess we can also revert d3c9634e. I didn't
>> do this in this series, because I'm lazy and selfish and thus only
>> changed the code I needed to get what I wanted to work ;)
>>
>> I've been running git-svn with these patches with core.autocrlf enabled
>> since December, and never seen the breakage that I saw before d3c9634e.
>
> Hi Erik,
>
> How does reverting d3c9634e affect dcommit?  I've never dealt with (or
> even looked at) autocrlf, so I'll put my trust in you and Dscho with
> anything related to it.
>

I don't think it affects svn dcommit in any way, except from the
implicit svn rebase that svn dcommit performs. d3c9634e sets
core.autocrlf to "false" on init, but re-enabling it hasn't shown any
problems in my end. I'm using git-svn with these patches and
core.autocrlf enabled every day at my day-job.

I'd say that reverting d3c9634e would be the Right Thing To Do(tm),
because it makes git svn clone work just as bad as git clone, when
cloning a repo with CRLFs in it ;)

-- 
Erik "kusma" Faye-Lund

  reply	other threads:[~2010-02-13 14:17 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-02-12 17:52 [PATCH 1/2] hash-object: support --stdin-paths with --no-filters Erik Faye-Lund
2010-02-12 17:52 ` [PATCH 2/2] git-svn: support fetch with autocrlf on Erik Faye-Lund
2010-02-13 12:25   ` Eric Wong
2010-02-13 14:16     ` Erik Faye-Lund [this message]
2010-02-13 23:59       ` Johannes Schindelin
2010-02-14  0:27         ` Erik Faye-Lund
2010-02-14  0:46           ` Johannes Schindelin
2010-02-14  1:04             ` Erik Faye-Lund
2010-02-13 23:55     ` Johannes Schindelin
2010-02-12 18:37 ` [PATCH 1/2] hash-object: support --stdin-paths with --no-filters Dmitry Potapov
2010-02-14 13:42   ` Erik Faye-Lund

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=40aa078e1002130616u478397c0xf757d5424630e6cf@mail.gmail.com \
    --to=kusmabite@googlemail.com \
    --cc=git@vger.kernel.org \
    --cc=johannes.schindelin@gmx.de \
    --cc=kusmabite@gmail.com \
    --cc=normalperson@yhbt.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.