Re: [BUG] Cannot push some grafted branches
- From
- Yann Dirson <dirson@bertin.fr>
- Date
- Dec 18, 2012, 11:00 UTC
- Message-ID
- <20121218120058.0c558ba5@chalon.bertin.fr>
- 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:
Show 14 quoted lines
> 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