From: Petr Baudis <pasky@suse.cz>
To: "Stephen R. van den Berg" <srb@cuci.nl>
Cc: git@vger.kernel.org
Subject: Re: RFC: grafts generalised
Date: Thu, 3 Jul 2008 02:13:31 +0200 [thread overview]
Message-ID: <20080703001331.GF12567@machine.or.cz> (raw)
In-Reply-To: <20080702143519.GA8391@cuci.nl>
On Wed, Jul 02, 2008 at 04:35:19PM +0200, Stephen R. van den Berg wrote:
> - Extend the grafts file format to support something like the following syntax:
>
> commit eb03813cdb999f25628784bb4f07b3f4c8bfe3f6
> Parent: 7bc72e647d54c2f713160b22e2e08c39d86c7c28
> Merge: 3b3da24960a82a479b9ad64affab50226df02abe 13b8f53e8ccec3b08eeb6515e6a10a2a
> Merge: ac719ed37270558f21d89676fce97eab4469b0f1
> Tree: 32fc99814b97322174dbe97ec320cf32314959e2
> Author: Foo Bar (FooBar) <foo@bar>
> AuthorDate: Sat Jun 6 13:50:44 1998 +0000
> Commit: Foo Bar (FooBar) <foo@bar>
> CommitDate: Sat Jun 7 13:50:44 1998 +0000
> Logmessage: First line of logmessage override
> Logmessage: Second line of logmessage override
> Logmessage: Etc.
Please, don't. It adds completely unnecessary complexity and it is
_not_ grafting anymore - look the word up in a dictionary. :-)
Have a look at what you wrote above - now, Git already has a way to
store all this information, right? In the commit objects!
So, the real solution is to take the commit objects you want to
modify, create new commit objects, then graft the new commit on all the
old commit children. It fits neatly in the Git philosophy, there is no
need at all to tweak the current infrastructure for this and it should
be trivial to automate, too.
--
Petr "Pasky" Baudis
The last good thing written in C++ was the Pachelbel Canon. -- J. Olson
next prev parent reply other threads:[~2008-07-03 0:14 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-07-02 14:35 RFC: grafts generalised Stephen R. van den Berg
2008-07-02 16:35 ` Jakub Narebski
2008-07-02 16:43 ` Michael J Gruber
2008-07-02 17:42 ` Stephen R. van den Berg
2008-07-02 18:25 ` Mike Hommey
2008-07-02 18:34 ` Michael J Gruber
2008-07-02 18:37 ` Stephen R. van den Berg
2008-07-02 19:31 ` Stephan Beyer
2008-07-02 19:36 ` Stephan Beyer
2008-07-02 20:42 ` Dmitry Potapov
2008-07-02 23:46 ` Stephan Beyer
2008-07-03 6:05 ` Stephen R. van den Berg
2008-07-07 6:28 ` Andreas Ericsson
2008-07-07 6:59 ` Stephen R. van den Berg
2008-07-02 17:32 ` Stephen R. van den Berg
2008-07-03 0:21 ` Petr Baudis
2008-07-03 7:11 ` Stephen R. van den Berg
2008-07-04 0:43 ` Jakub Narebski
2008-07-02 17:19 ` Dmitry Potapov
2008-07-02 17:58 ` Dmitry Potapov
2008-07-02 18:10 ` Stephen R. van den Berg
2008-07-02 18:33 ` Dmitry Potapov
2008-07-02 20:39 ` Dmitry Potapov
2008-07-02 21:18 ` Stephen R. van den Berg
2008-07-02 21:28 ` Avery Pennarun
2008-07-02 21:27 ` Junio C Hamano
2008-07-02 21:49 ` Junio C Hamano
2008-07-03 0:03 ` Junio C Hamano
2008-07-03 6:02 ` Johannes Sixt
2008-07-03 7:30 ` Stephen R. van den Berg
2008-07-03 7:42 ` Johannes Sixt
2008-07-03 9:37 ` Stephen R. van den Berg
2008-07-02 17:59 ` Stephen R. van den Berg
2008-07-03 0:13 ` Petr Baudis [this message]
2008-07-03 0:16 ` Petr Baudis
2008-07-03 0:28 ` Junio C Hamano
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=20080703001331.GF12567@machine.or.cz \
--to=pasky@suse.cz \
--cc=git@vger.kernel.org \
--cc=srb@cuci.nl \
/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.