Re: [BUG] Cannot push some grafted branches

From: Yann Dirson <dirson@bertin.fr>
Date: Dec 17, 2012, 07:52 UTC
Message-ID: <20121217085242.02a77243@chalon.bertin.fr>
In-Reply-To: <7v38zb3ux0.fsf@alter.siamese.dyndns.org>

On Wed, 12 Dec 2012 11:57:47 -0800 Junio C Hamano <gitster@pobox.com> wrote:

Show 9 quoted lines

> Yann Dirson <dirson@bertin.fr> writes:
> 
> > ....  In this respect, they seem to be
> > lacking a few features, when compared to "replace" refs, but they have different
> > uses, ...
> 
> Not reallyl; grafts were old hack whose use is still supported with
> its original limitations; replace is meant to replace all uses of
> grafts while removing grafts' largest warts.

OK, I'll take this into account.

But this situation should probably be make more clear in the docs. Currently, gitrepository-layout.txt describes refs/replace/ (and shallow) by reference to grafts, and those are not marked as discouraged-use or anything.

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:

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