From: Michael J Gruber <git@drmicha.warpmail.net>
To: bdowning@lavos.net
Cc: Junio C Hamano <gitster@pobox.com>,
git@vger.kernel.org,
Linus Torvalds <torvalds@linux-foundation.org>,
msysgit@googlegroups.com
Subject: Re: Git no longer reads attributes from the index properly
Date: Fri, 20 Mar 2009 10:45:06 +0100 [thread overview]
Message-ID: <49C365A2.5070607@drmicha.warpmail.net> (raw)
In-Reply-To: <20090320084031.GD1037@lavos.net>
Brian Downing venit, vidit, dixit 20.03.2009 09:40:
>
> On Fri, Mar 20, 2009 at 01:27:31AM -0700, Junio C Hamano wrote:
>> bdowning@lavos.net (Brian Downing) writes:
>>> As of 34110cd4e394e3f92c01a4709689b384c34645d8, (2008-03-06, just over a
>>> year ago), Git no longer reads attributes from the index properly in all
>>> cases....
>>
>> Perhaps you would want to try it on 06f33c1 (Read attributes from the
>> index that is being checked out, 2009-03-13) that is part of 'pu'?
>
> I only tried it on next, groan. Yes, it works there, thanks.
>
> However, that commit looks like it's solving a different problem
> entirely (supporting changing between two branches where .gitattributes
> exists in both cases) and happens to fix the no .gitattributes -> read
> from index regression at the same time. I don't know enough about the
> guts to tell, but does this also fix the core problem of the regression
> (I assume something about trying to read from the wrong index, given the
> commit that broke it), or does it just happen to work around it?
>
> Specifically, it would be nice to have a fix for the regression that
> could land on maint relatively soon, as the initial checkout case is
> breaking a real repository I use, whereas the switching branches case is
> something I don't care about as much at the moment.
>
> Of course, I don't know how to fix it at the moment, and beggars can't
> be choosers. :)
You're testing whether a checkout without index and with empty work tree
works, right?
In that case, the checkout needs to make sure that .gitattributes is
checked out (or at least respected) before all other files, and that is
exactly what the patch in pu does. [If I remember right that great
simplification patch you bisected as bad played a role there, unless I'm
mixing up threads...]
Michael
next prev parent reply other threads:[~2009-03-20 9:47 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-03-20 7:35 Git no longer reads attributes from the index properly Brian Downing
2009-03-20 8:27 ` Junio C Hamano
2009-03-20 8:40 ` Brian Downing
2009-03-20 9:45 ` Michael J Gruber [this message]
2009-03-20 10:16 ` Junio C Hamano
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=49C365A2.5070607@drmicha.warpmail.net \
--to=git@drmicha.warpmail.net \
--cc=bdowning@lavos.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=msysgit@googlegroups.com \
--cc=torvalds@linux-foundation.org \
/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.