From: Alexander Klink <ak-git@cynops•de>
To: git@vger•kernel.org
Subject: Re: git-svn failure when symlink added in svn
Date: Thu, 26 Apr 2007 23:07:09 +0000 (UTC) [thread overview]
Message-ID: <loom.20070427T005115-751@post.gmane.org> (raw)
In-Reply-To: m2slb1c8ps.fsf@fhcrc.org
Hi,
Seth Falcon <sethfalcon <at> gmail.com> writes:
> Eric Wong <normalperson <at> yhbt.net> writes:
> > I can't reproduce it on Linux with ext3. I translated your recipe into
> > a test script in the patch below. Anybody familiar with OSX and/or HFS
> > know if there's a workaround or fix for this?
I've been investigating this problem too, as it keeps biting me when importing
our (OpenXPKIs) subversion tree using git-svn. I'd love to work with git and
am happy to help with debugging this further. Still, I am a pretty puzzled on why
this happens ...
> And so then on Linux with -v I get (after snipping most of the
> output):
> First, rewinding head to replay your work on top of it...
> symlink: 'foo.txt' => 'bar.txt'
> On my OSX laptop I get:
> First, rewinding head to replay your work on top of it...
> symlink: 'foo.txt' => ''
Same here (this is a MacBook Pro, for what it's worth, BTW). As said, I've
investigated this a bit further. The empty filename in new seems to come from
trying to read the wrong SHA1 file. If one outputs ce->sha1 before
void *new = read_sha1_file(ce->sha1, &type, size);
is called, one gets different output on Linux and Mac OS X.
For Seth's example, I get 5f34b0af07646aa529b5b005cde3a9559e606210 on Linux
and e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 on Mac OS X ...
I've tried tracking down where this comes from. Here is what I've learned:
- read_blob_entry() is called from write_entry().
SHA1 is already incorrect at that point in time.
- write_entry() is called from checkout_entry().
SHA1 is already incorrect at that point in time.
- checkout_entry() is called from check_updates().
SHA1 is already incorrect at that point in time.
Unluckily I could not figure out, where it is computed in the first place.
One idea was that maybe it was cached from the old file in the Mac OS X case
and recomputed on Linux or so? Or maybe it's not git's fault but git-svn
messes up (although I doubt it)?
I'll happy try out anything that has a slight chance of solving this issue
(workarounds greatly appreciated, too).
Best regards,
Alex
next prev parent reply other threads:[~2007-04-27 8:25 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-04-14 6:41 git-svn failure when symlink added in svn Seth Falcon
2007-04-14 20:10 ` Eric Wong
2007-04-16 3:13 ` Seth Falcon
2007-04-26 23:07 ` Alexander Klink [this message]
2007-04-27 18:03 ` Linus Torvalds
2007-04-28 13:02 ` Alexander Klink
2007-04-28 16:54 ` Seth Falcon
2007-04-28 17:31 ` Junio C Hamano
2007-04-28 18:13 ` Seth Falcon
2007-04-28 18:34 ` Junio C Hamano
2007-04-28 21:15 ` Seth Falcon
2007-04-28 22:43 ` Junio C Hamano
[not found] ` <m2irbfqlze.fsf@ziti.local>
2007-04-29 18:26 ` Eric Wong
2007-04-30 14:43 ` Seth Falcon
2007-04-30 15:43 ` Eric Wong
2007-05-01 17:49 ` Seth Falcon
2007-04-29 18:31 ` Eric Wong
2007-04-29 21:01 ` Junio C Hamano
2007-04-29 22:21 ` Eric Wong
2007-04-30 0:24 ` Alexander Klink
2007-04-30 5:08 ` Junio C Hamano
2007-04-30 6:31 ` Eric Wong
2007-04-30 14:33 ` Seth Falcon
2007-05-01 20:53 ` Alexander Klink
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=loom.20070427T005115-751@post.gmane.org \
--to=ak-git@cynops$(echo .)de \
--cc=git@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox