Adding History

Adding History

[Roger Garvin]

Is there a way to add history to a repository?
We have just started using git, where before we had nothing but backup
directories all over the place.  We created the git repository using our
existing source directory.  Is there a way to now go and add some of the backup
source directories to the history?  Or would this break all the SHA1 of the
current objects?  I am not sure it would be worth it at this point.  But we are
still pretty early in our use of git so now would be the easiest time.  

Roger

Re: Adding History

[Shawn O. Pearce]

Roger Garvin <yoyodyn@gmail.com> wrote:
> Is there a way to add history to a repository?
> We have just started using git, where before we had nothing but backup
> directories all over the place.  We created the git repository using our
> existing source directory.  Is there a way to now go and add some of the backup
> source directories to the history?  Or would this break all the SHA1 of the
> current objects?

Right, you need to change the SHA-1 of all of the commits in order
to insert history in the past.

> I am not sure it would be worth it at this point.  But we are
> still pretty early in our use of git so now would be the easiest time.  

You have two options:

- Use git-filter-branch now to rewrite your commits with the
history added.  Its a one-time pain that you need to go through to
discard all of your current objects, and move to the new ones that
have the history.

- Keep the current objects, but if you need the history, add it
to the local repository by editing the grafts file.  This is how
the Linux kernel team can insert history that predates Git, if
they absolutely must have it.

It depends on how often you need to look at that history.  If its
"almost never", I would probably go with the graft.  If its "often",
I would consider the filter-branch now.

-- 
Shawn.

Re: Adding History

[John Tapsell]

2009/3/19 Shawn O. Pearce <spearce@spearce.org>:
> Roger Garvin <yoyodyn@gmail.com> wrote:
>> Is there a way to add history to a repository?
>> We have just started using git, where before we had nothing but backup
>> directories all over the place.  We created the git repository using our
>> existing source directory.  Is there a way to now go and add some of the backup
>> source directories to the history?  Or would this break all the SHA1 of the
>> current objects?
>
> Right, you need to change the SHA-1 of all of the commits in order
> to insert history in the past.
>
>> I am not sure it would be worth it at this point.  But we are
>> still pretty early in our use of git so now would be the easiest time.
>
> You have two options:

Couldn't you just create import the whole tree and then rebase on top of it?