Re: Retrieving a file at a before a specified commit

From: Jeff King <peff@peff.net>
Date: May 29, 2013, 07:58 UTC
Message-ID: <20130529075811.GA7204@sigill.intra.peff.net>
In-Reply-To: <20130529164735.5489ab47953406745d9034ef@mega-nerd.com>

On Wed, May 29, 2013 at 04:47:35PM +1000, Erik de Castro Lopo wrote:

Show 18 quoted lines

> I have a commit like this:
> 
>     commit 4d77a3cee01db0412956d40875c79f51ac745acc
>     tree 3443c9f633114c3bd2e015453a8c55a171e62b53
>     parent 340d808ade8a79857bec40770f0eb4f98224c53d
>     author ....
>     committer .....
> 
> which modifies file A/B/C (ie specifically does not add, but changes
> an existing file in the repo).
> 
> I would then like to retrive the version of the file A/B/C before
> commit 4d77a3cee by using the parent commit 340d808a:
> 
>    git show 340d808ade8a79857bec40770f0eb4f98224c53d:A/B/C
> 
> which works for most files/commits I try this with, but doesn't work
> in one particular case.

Yes, that should work as long as the file is modified and not added. You can also say "4d77a3cee^:A/B/C" if you do not want to look up the parent id yourself.

Note that for a merge commit with multiple parents, the question is more complex, as there are two previous states that are merged.

You say that it doesn't work in one particular case. What is that case? What happens?

> Questions:
> 
> - Is my understanding of the above git command incorrect?

No, I think it is correct.

> - Is this a corrupt repo? Is there some way to check?

Running "git fsck" can tell you if there is repository corruption.

> - Is there some explaination of why I can't get the previous version
>   of that file?

Probably. Can you show us the commit that fails? What does git say when you try it?

-Peff