Re: fixing duplicated history

2 messages, 2 authors, 2016-06-15 · open the first message on its own page

Re: fixing duplicated history

From: Junio C Hamano <hidden>
Date: 2016-06-15 22:45:38

Felipe Balbi [off-list ref] 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

From: Felipe Balbi <hidden>
Date: 2016-06-15 22:45:38

On Wed, Nov 12, 2008 at 02:53:55PM -0800, Junio C Hamano wrote:
Felipe Balbi [off-list ref] writes:
quoted
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
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help