fixing duplicated history

fixing duplicated history

[Felipe Balbi]

Hi,

I have a git tree which history is completely messed up with duplicated
entries. By reading git man pages I saw that it might be possible to
delete those duplicated entries with git reflog delete, am I reading it
right ?

If so, would it cause any problems to the users who already cloned the
original tree ? I mean, will git see it as a different history line and
try a merge or will it figure it's the same tree with the duplicated
entries removed ?

Thanks in advance for the help

-- 
balbi

Re: fixing duplicated history

[Robin Rosenberg]

onsdag 12 november 2008 23:23:51 skrev Felipe Balbi:
> Hi,
> 
> I have a git tree which history is completely messed up with duplicated
> entries. By reading git man pages I saw that it might be possible to
> delete those duplicated entries with git reflog delete, am I reading it
> right ?
No. The reflog is not the history, except your very local log of what
the heads pointed to. You do not see the reflog unless you ask for it,
and nobody else can see it (i.e. *your* reflog).

What looks like duplicate entries may commit that have been cherry
picked into one or more branches that have been merged thereafter. If
you look carefully they have different id's.

-- robin

Re: fixing duplicated history

[Junio C Hamano]

Felipe Balbi <me@felipebalbi.com> writes:

> I have a git tree which history is completely messed up with duplicated
> entries. By reading git man pages I saw that it might be possible to
> delete those duplicated entries with git reflog delete, am I reading it
> right ?
>
> If so, would it cause any problems to the users who already cloned the
> original tree ? I mean, will git see it as a different history line and
> try a merge or will it figure it's the same tree with the duplicated
> entries removed ?

I assume that you meant "commit" by "entry", and also I assume that you
read "git filter-branch" not "git reflog delete".  Then you are right.

And rewriting history with filter-branch will cause problems to the
downstream users.

Re: fixing duplicated history

[Felipe Balbi]

On Wed, Nov 12, 2008 at 02:53:55PM -0800, Junio C Hamano wrote:
> Felipe Balbi <me@felipebalbi.com> writes:
> 
> > I have a git tree which history is completely messed up with duplicated
> > entries. By reading git man pages I saw that it might be possible to
> > delete those duplicated entries with git reflog delete, am I reading it
> > right ?
> >
> > If so, would it cause any problems to the users who already cloned the
> > original tree ? I mean, will git see it as a different history line and
> > try a merge or will it figure it's the same tree with the duplicated
> > entries removed ?
> 
> I assume that you meant "commit" by "entry", and also I assume that you
> read "git filter-branch" not "git reflog delete".  Then you are right.
> 
> And rewriting history with filter-branch will cause problems to the
> downstream users.

Yes, you got me right. Hmm, so if it'll cause problems to the downstream
users I can't do anything, unfortunately :-(

Unless they wanna clone the tree again :-p

Thanks for the info Junio.

-- 
balbi