From: Michael Schubert <mschub@elegosoft.com>
To: Sam Vilain <sam@vilain.net>
Cc: James Walmsley <james@fullfat-fs.co.uk>,
"git@vger.kernel.org" <git@vger.kernel.org>
Subject: Re: Identify Commit ID from an Extracted Source Snapshot
Date: Fri, 17 Feb 2012 00:43:29 +0100 [thread overview]
Message-ID: <4F3D94A1.2040706@elegosoft.com> (raw)
In-Reply-To: <4F3D8EFF.9000806@vilain.net>
On 02/17/2012 12:19 AM, Sam Vilain wrote:
> On 2/16/12 3:00 PM, Michael Schubert wrote:
>> On 02/16/2012 11:06 PM, James Walmsley wrote:
>>> I couldn't find this on google, and I have no idea if its even
>>> possible. I have several zip files from previous versions of my
>>> source code. (I imported svn into git). I would like to add TAGS
>>> to git which represent the versions based on the files in my zip
>>> archives.
>>>
>>> Does anyone know how to do this?
>>
>> If it's just about providing the ancient code together with the
>> (imported) more recent history from SVN, you could create an extra
>> orphan branch for each zip packet, add the files, commit and
>> eventually tag.
>>
>> If your question is more like "how do I tell git to find out where
>> this old code fits in my history and eventually place it there",
>> the answer is: you cannot do it. No VCS will do this and
>> especially not Git.
>
> Once you've got a tree in git which corresponds to the contents of
> the zip file, you can use git diff --stat TREEID COMMITID
>
> You can get the commitid by obtaining the most recent timestamp for a
> file within the archive, then just using git rev-list --all
> --since=... --until=... to get a window of commit IDs, and hunt
> around until you find the one with the smallest diff.
>
> It's hardly a straightforward thing, usually because the contents of
> the zip file never quite match the exact contents of source
> control—think autoconf and other files generated for distribution but
> not stored in the history. So you need to use a fuzzy search.
I totally disregared the "slicing and rebuilding history approach", just
because I didn't think that's what James is asking about. Could be fun.
next prev parent reply other threads:[~2012-02-16 23:44 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-16 22:06 Identify Commit ID from an Extracted Source Snapshot James Walmsley
2012-02-16 23:00 ` Michael Schubert
2012-02-16 23:19 ` Sam Vilain
2012-02-16 23:43 ` Michael Schubert [this message]
2012-02-16 23:53 ` Jonathan Nieder
2012-02-17 0:14 ` Michael Schubert
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=4F3D94A1.2040706@elegosoft.com \
--to=mschub@elegosoft.com \
--cc=git@vger.kernel.org \
--cc=james@fullfat-fs.co.uk \
--cc=sam@vilain.net \
/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).