From: Thomas Rast <trast@inf.ethz.ch>
To: Yann Dirson <dirson@bertin.fr>
Cc: Johannes Sixt <j.sixt@viscovery.net>,
Junio C Hamano <gitster@pobox.com>,
Andreas Schwab <schwab@linux-m68k.org>,
Christian Couder <christian.couder@gmail.com>,
git list <git@vger.kernel.org>
Subject: Re: [BUG] Cannot push some grafted branches
Date: Tue, 18 Dec 2012 15:31:03 +0100 [thread overview]
Message-ID: <87txrjsa8o.fsf@pctrast.inf.ethz.ch> (raw)
In-Reply-To: <20121218144157.00ccd915@chalon.bertin.fr> (Yann Dirson's message of "Tue, 18 Dec 2012 14:41:57 +0100")
Yann Dirson <dirson@bertin.fr> writes:
>> +EXAMPLE
>> +-------
>> +
>> +Replacements (and before them, grafts) are often used to replace the
>> +parent list of a commit. Since commits are stored in a human-readable
>> +format, you can in fact change any property using the following
>> +recipe:
>> +
>> +------------------------------------------------
>> +$ git cat-file commit original_commit >tmp
>> +$ vi tmp
>> +------------------------------------------------
>> +In the editor, adjust the commit as needed. For example, you can edit
>> +the parent lists by adding/removing lines starting with "parent".
>> +When done, replace the original commit with the edited one:
>> +------------------------------------------------
>> +$ git replace original_commit $(git hash-object -w tmp)
>
> You probably meant "-t commit" - a sign that it's not so trivial to forge ?
Mostly a sign that despite my testing efforts, I still fail at
cut&paste...
But yes, it absolutely needs -t commit. Otherwise the commit would be
replaced by a blob, and confusion ensues.
--
Thomas Rast
trast@{inf,student}.ethz.ch
next prev parent reply other threads:[~2012-12-18 14:31 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
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 [this message]
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87txrjsa8o.fsf@pctrast.inf.ethz.ch \
--to=trast@inf.ethz.ch \
--cc=christian.couder@gmail.com \
--cc=dirson@bertin.fr \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=j.sixt@viscovery.net \
--cc=schwab@linux-m68k.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.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.