Re: [BUG] Cannot push some grafted branches
- From
- Yann Dirson <dirson@bertin.fr>
- Date
- Dec 17, 2012, 10:30 UTC
- Message-ID
- <20121217113036.7745f956@chalon.bertin.fr>
- In-Reply-To
- <7vfw35m509.fsf@alter.siamese.dyndns.org>
On Mon, 17 Dec 2012 00:56:06 -0800 Junio C Hamano <gitster@pobox.com> wrote:
Show 10 quoted lines
> Yann Dirson <dirson@bertin.fr> writes: > > > And we may still want the bug fixed, or would we just list it as a known bug ? > > At least it does not seem to occur with "replace" refs: > > The "replace" was designed to "fix" known limitation of grafts, > which is _inherent_ to it; the graft information was designed _not_ > to be shared across repositories. The fix was done by by using a > different mechanism to allow propagating the information across > repositories.
I see. But from what I observed (without looking at the source), it looks like when determining which commits are to be pushed, the grafts file is not "neutralized" as it should.
> So there is nothing further to fix, except that there is a documentation > bug you can fix if you didn't find it documented.
Will do.
Show 10 quoted lines
> Thanks.
>
> >
> > git-test$ rm .git/info/grafts
> > git-test$ echo "fake merge" | git commit-tree master^{tree} -p master^ -p maint
> > b821b2aa00973a47936d7cd25c9a5978b1c839c6
> > git-test$ git replace master b821b2aa00973a47936d7cd25c9a5978b1c839c6
> > git-test$ git push origin maint
> > ...
> > 50b03b0..79211fe maint -> maint-- Yann Dirson - Bertin Technologies