From: Yann Dirson <dirson@bertin.fr>
To: Junio C Hamano <gitster@pobox.com>
Cc: Andreas Schwab <schwab@linux-m68k.org>,
Christian Couder <christian.couder@gmail.com>,
Thomas Rast <trast@student.ethz.ch>,
git list <git@vger.kernel.org>
Subject: Re: [BUG] Cannot push some grafted branches
Date: Tue, 18 Dec 2012 12:00:58 +0100 [thread overview]
Message-ID: <20121218120058.0c558ba5@chalon.bertin.fr> (raw)
In-Reply-To: <7vwqwgjs8f.fsf@alter.siamese.dyndns.org>
On Mon, 17 Dec 2012 13:14:56 -0800
Junio C Hamano <gitster@pobox.com> wrote:
> Andreas Schwab <schwab@linux-m68k.org> writes:
>
> > Christian Couder <christian.couder@gmail.com> writes:
> >
> >> Yeah, at one point I wanted to have a command that created to craft a
> >> new commit based on an existing one.
> >
> > This isn't hard to do, you only have to resort to plumbing:
> >
> > $ git cat-file commit fef11965da875c105c40f1a9550af1f5e34a6e62 | sed s/bfae342c973b0be3c9e99d3d86ed2e6b152b4a6b/790c83cda92f95f1b4b91e2ddc056a52a99a055d/ | git hash-object -t commit --stdin -w
> > bb45cc6356eac6c7fa432965090045306dab7026
>
> Good. I do not think an extra special-purpose command is welcome
> here.
Well, I'm not sure this is intuitive enough to be useful to the average user :)
Adding git-rev-parse calls for convenience, and calling git-replace, would make it
a more complete recipe, and we could suggest that as an alias in the collection that's
in the wiki (which is not even linked any more from git-scm.com btw), but imho that
would be hiding valuable information in a dark corner.
Anyway, in this form it will only replace a parent with another, whereas a full
graft replacement should allow to write a different number of new parents instead.
That is, instead of this simple sed, something like:
(NEWPARENTS='parent xxx\nparent yyy\nparent zzz\n; git cat-file commit master | perl -ne 'BEGIN { $state=0 }; if ($state eq 0) { if (/^parent/) { $state=1 } else { print } } elsif ($state eq 1) { if (/^author/) { print "'"$NEWPARENTS"'"; print; $state=2 } } else { print }')
Well, a short bash script should be more readable and possibly faster, but that's the
idea. Such a script could be a candidate for contrib ?
--
Yann Dirson - Bertin Technologies
next prev parent reply other threads:[~2012-12-18 11:01 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 [this message]
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=20121218120058.0c558ba5@chalon.bertin.fr \
--to=dirson@bertin.fr \
--cc=christian.couder@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=schwab@linux-m68k.org \
--cc=trast@student.ethz.ch \
/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).