Skip to contentSkip to conversation

fixing duplicated history

DISCUSSION Felipe Balbi 3 participants 4 messages Jun 15, 2016

lore
Share & tools
lore
#0 lore raw

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

Signature · 1 line
balbi
#1 lore raw

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

Quoted 6 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

#2 lore raw
In reply to Felipe Balbi
Quoted 9 lines · Felipe Balbi

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.

#3 lore raw
Quoted 12 lines · Junio C Hamano
Quoted 9 lines · Felipe Balbi

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 ?

Quoted 5 lines

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.

Signature · 1 line
balbi