From: Junio C Hamano <gitster@pobox.com>
To: Yann Dirson <dirson@bertin.fr>
Cc: git list <git@vger.kernel.org>
Subject: Re: [BUG] Cannot push some grafted branches
Date: Mon, 17 Dec 2012 00:56:06 -0800 [thread overview]
Message-ID: <7vfw35m509.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <20121217085242.02a77243@chalon.bertin.fr> (Yann Dirson's message of "Mon, 17 Dec 2012 08:52:42 +0100")
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.
So there is nothing further to fix, except that there is a documentation
bug you can fix if you didn't find it documented.
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
next prev parent reply other threads:[~2012-12-17 8:56 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-12-11 14:39 [BUG] Cannot push some grafted branches Yann Dirson
2012-12-11 18:15 ` Junio C Hamano
2012-12-12 8:44 ` Yann Dirson
2012-12-12 10:54 ` Yann Dirson
2012-12-12 19:57 ` Junio C Hamano
2012-12-17 7:52 ` Yann Dirson
2012-12-17 8:56 ` Junio C Hamano [this message]
2012-12-17 10:30 ` Yann Dirson
2012-12-17 8:43 ` Thomas Rast
2012-12-17 10:40 ` Yann Dirson
2012-12-17 13:43 ` Christian Couder
2012-12-17 14:02 ` Yann Dirson
2012-12-17 20:03 ` Andreas Schwab
2012-12-17 21:14 ` Junio C Hamano
2012-12-18 11:00 ` Yann Dirson
2012-12-18 12:03 ` Johannes Sixt
2012-12-18 12:49 ` Thomas Rast
2012-12-18 13:41 ` Yann Dirson
2012-12-18 14:31 ` Thomas Rast
2012-12-18 16:24 ` Jeff King
2012-12-19 7:13 ` Johannes Sixt
2012-12-19 13:06 ` Jeff King
2012-12-18 16:09 ` Junio C Hamano
2012-12-19 8:29 ` Yann Dirson
2012-12-19 13:12 ` Thomas Rast
2012-12-19 20:07 ` Junio C Hamano
2012-12-21 12:47 ` Michael J Gruber
2012-12-21 16:58 ` Junio C Hamano
2012-12-22 16:38 ` Michael J Gruber
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7vfw35m509.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=dirson@bertin.fr \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).