{"thread":{"id":"16293","subject":"fixing duplicated history","startedAt":"2008-11-12T22:23:51Z","lastAt":"2008-11-12T22:57:48Z","messageCount":4,"participants":["Felipe Balbi","Robin Rosenberg","Junio C Hamano"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"95634","messageId":"20081112222346.GA24013@frodo","threadId":"16293","inReplyTo":null,"subject":"fixing duplicated history","fromName":"Felipe Balbi","fromEmail":"me@felipebalbi.com","sentAt":"2008-11-12T22:23:51Z","receivedAt":"2008-11-12T22:23:51Z","isPatch":false,"sender":{"key":"me@felipebalbi.com","avatar":null},"body":"Hi,\n\nI have a git tree which history is completely messed up with duplicated\nentries. By reading git man pages I saw that it might be possible to\ndelete those duplicated entries with git reflog delete, am I reading it\nright ?\n\nIf so, would it cause any problems to the users who already cloned the\noriginal tree ? I mean, will git see it as a different history line and\ntry a merge or will it figure it's the same tree with the duplicated\nentries removed ?\n\nThanks in advance for the help\n\n-- \nbalbi\n"},{"id":"95642","messageId":"200811122352.57476.robin.rosenberg.lists@dewire.com","threadId":"16293","inReplyTo":"20081112222346.GA24013@frodo","subject":"Re: fixing duplicated history","fromName":"Robin Rosenberg","fromEmail":"robin.rosenberg.lists@dewire.com","sentAt":"2008-11-12T22:52:57Z","receivedAt":"2008-11-12T22:52:57Z","isPatch":false,"sender":{"key":"robin.rosenberg@dewire.com","avatar":"https://avatars.githubusercontent.com/u/46357?v=4"},"body":"onsdag 12 november 2008 23:23:51 skrev Felipe Balbi:\n> Hi,\n> \n> I have a git tree which history is completely messed up with duplicated\n> entries. By reading git man pages I saw that it might be possible to\n> delete those duplicated entries with git reflog delete, am I reading it\n> right ?\nNo. The reflog is not the history, except your very local log of what\nthe heads pointed to. You do not see the reflog unless you ask for it,\nand nobody else can see it (i.e. *your* reflog).\n\nWhat looks like duplicate entries may commit that have been cherry\npicked into one or more branches that have been merged thereafter. If\nyou look carefully they have different id's.\n\n-- robin\n"},{"id":"95643","messageId":"7vod0klfng.fsf@gitster.siamese.dyndns.org","threadId":"16293","inReplyTo":"20081112222346.GA24013@frodo","subject":"Re: fixing duplicated history","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2008-11-12T22:53:55Z","receivedAt":"2008-11-12T22:53:55Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Felipe Balbi <me@felipebalbi.com> writes:\n\n> I have a git tree which history is completely messed up with duplicated\n> entries. By reading git man pages I saw that it might be possible to\n> delete those duplicated entries with git reflog delete, am I reading it\n> right ?\n>\n> If so, would it cause any problems to the users who already cloned the\n> original tree ? I mean, will git see it as a different history line and\n> try a merge or will it figure it's the same tree with the duplicated\n> entries removed ?\n\nI assume that you meant \"commit\" by \"entry\", and also I assume that you\nread \"git filter-branch\" not \"git reflog delete\".  Then you are right.\n\nAnd rewriting history with filter-branch will cause problems to the\ndownstream users.\n"},{"id":"95644","messageId":"20081112225739.GB24013@frodo","threadId":"16293","inReplyTo":"7vod0klfng.fsf@gitster.siamese.dyndns.org","subject":"Re: fixing duplicated history","fromName":"Felipe Balbi","fromEmail":"me@felipebalbi.com","sentAt":"2008-11-12T22:57:48Z","receivedAt":"2008-11-12T22:57:48Z","isPatch":false,"sender":{"key":"me@felipebalbi.com","avatar":null},"body":"On Wed, Nov 12, 2008 at 02:53:55PM -0800, Junio C Hamano wrote:\n> Felipe Balbi <me@felipebalbi.com> writes:\n> \n> > I have a git tree which history is completely messed up with duplicated\n> > entries. By reading git man pages I saw that it might be possible to\n> > delete those duplicated entries with git reflog delete, am I reading it\n> > right ?\n> >\n> > If so, would it cause any problems to the users who already cloned the\n> > original tree ? I mean, will git see it as a different history line and\n> > try a merge or will it figure it's the same tree with the duplicated\n> > entries removed ?\n> \n> I assume that you meant \"commit\" by \"entry\", and also I assume that you\n> read \"git filter-branch\" not \"git reflog delete\".  Then you are right.\n> \n> And rewriting history with filter-branch will cause problems to the\n> downstream users.\n\nYes, you got me right. Hmm, so if it'll cause problems to the downstream\nusers I can't do anything, unfortunately :-(\n\nUnless they wanna clone the tree again :-p\n\nThanks for the info Junio.\n\n-- \nbalbi\n"}]}