threads / discuss / 16293

fixing duplicated history

Subject: fixing duplicated history

## tl;dr

4 messages between Nov 12, 2008 and Nov 12, 2008.

replies: 3people: 3as markdown or json

Felipe Balbi· Nov 12, 2008, 22:23 UTC · lore

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

Robin Rosenberg· Nov 12, 2008, 22:52 UTC · re: Felipe Balbi · lore

Re: fixing duplicated history

onsdag 12 november 2008 23:23:51 skrev Felipe Balbi:

Show 6 quoted lines

> 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

Junio C Hamano· Nov 12, 2008, 22:53 UTC · re: Felipe Balbi · lore

Re: fixing duplicated history

Felipe Balbi <me@felipebalbi.com> writes:

Show 9 quoted lines

> 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.

Felipe Balbi· Nov 12, 2008, 22:57 UTC · re: Junio C Hamano · lore

Re: fixing duplicated history

On Wed, Nov 12, 2008 at 02:53:55PM -0800, Junio C Hamano wrote:

Show 17 quoted lines

> 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