[Olsr-dev] Possible to fix errors in git repo?

Ferry Huberts (spam-protected)
Wed Jun 15 09:34:35 CEST 2011

On 06/15/2011 08:32 AM, Henning Rogge wrote:
>> the way to fix this is to export and re-import the entire tree.
>> however, every commit id will change, which is kind of not-so-nice since
>> the tree is public
> I did some tests with a number of local trees and noticed another problem.
> I imported the olsr.org tree (to have a "olsr.org repository" to experiment 
> with), then cloned it locally.
> I then replaced the content of the local olsr.org repository with the fixed 
> content from Aaron Daubmans github repository... no fsck errors anymore there.
> Then I pulled from the cloned client... git did it without a warning, and did 
> a merge with the new stable branch.
> This means the client repository now contains the good AND the bad commits.

any pushes to the new repo must be rebased on the new repo.
this is trivial but must be enforced to prevent the old tree getting
back into the repo.

> When the client pushs, the bad commits are inside the olsr.org repository 
> again!
> Henning Rogge

Ferry Huberts

More information about the Olsr-dev mailing list