Re: What's cooking in git.git (Nov 2008, #06; Wed, 26)

From: Junio C Hamano <gitster@pobox.com>
Date: Dec 12, 2008, 01:41 UTC
Message-ID: <7vy6ym9nm8.fsf@gitster.siamese.dyndns.org>
In-Reply-To: <alpine.LNX.1.00.0812111520490.19665@iabervon.org>

Daniel Barkalow <barkalow@iabervon.org> writes:

Show 7 quoted lines

>> That's the point. CE_VALID does not define checkout area while
>> CE_NO_CHECKOUT does.  If an entry is CE_VALID, it is still in checkout
>> area. But if it is CE_NO_CHECKOUT, "git grep" should ignore that path.
>> core.defaultsparse has nothing to do here.
>
> My point is that the index cannot tell git grep whether it should search a 
> path if the path isn't in the index.

Let's step back a bit. I think "git grep" that stays silent outside of the checkout area when used to grep in the work tree or in the index is a mistake.

The problem "sparse checkout" attempts to address is not this:

    I ran "git init && git add ." in /usr/src by mistake.  There is no
    reason for coreutils that is in /usr/src/coreutils and gnucash that is
    in /usr/src/gnucash to share the same development history nor their
    should be any ordering between commits in these two independent
    projects.  I should have done N separate "init & add" independently at
    one level deeper in the directory hierarchy, but I am too lazy to
    filter branch the resulting mess now.

At least, it should not be that, at least to me.

"Sparse" is "I am not going to modify the files in these areas, and I know they do not need to be present for my purposes (e.g. build), so I do not need copies in the work tree." It still works on the whole tree structure recorded in the commit, but gives you a way to work inside a sparsely populated work tree, iow, without checking everything out.

So "git grep -e frotz Documentation/", whether you only check out Documentation or the whole tree, should grep only in Documentation area, and "git grep -e frotz" should grep in the whole tree, even if you happen to have a sparse checkout. By definition, a sparse checkout has no modifications outside the checkout area, so whenever grep wants to look for strings outside the checkout area it should pretend as if the same content as what the index records is in the work tree. This is consistent with the way how "git diff" in a sparsely checked out work tree should behave.

If you understand that, it is clear what "git grep -e frotz HEAD^" should do. No checkout area is involved.