From: Jeff King <peff@peff.net>
To: Erik de Castro Lopo <mle+tools@mega-nerd.com>
Cc: git@vger.kernel.org
Subject: Re: Retrieving a file at a before a specified commit
Date: Wed, 29 May 2013 03:58:11 -0400 [thread overview]
Message-ID: <20130529075811.GA7204@sigill.intra.peff.net> (raw)
In-Reply-To: <20130529164735.5489ab47953406745d9034ef@mega-nerd.com>
On Wed, May 29, 2013 at 04:47:35PM +1000, Erik de Castro Lopo wrote:
> 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
next prev parent reply other threads:[~2013-05-29 7:58 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-05-29 6:47 Retrieving a file at a before a specified commit Erik de Castro Lopo
2013-05-29 7:58 ` Jeff King [this message]
2013-05-30 0:49 ` Erik de Castro Lopo
2013-05-30 0:59 ` Erik de Castro Lopo
2013-05-30 2:27 ` Junio C Hamano
2013-05-30 3:18 ` Erik de Castro Lopo
2013-05-30 2:34 ` Jeff King
2013-05-30 3:19 ` Erik de Castro Lopo
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=20130529075811.GA7204@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=mle+tools@mega-nerd.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).