From: "SZEDER Gábor" <szeder@ira.uka.de>
To: Jakub Narebski <jnareb@gmail.com>
Cc: "Miklos Vajna" <vmiklos@frugalware.org>,
"SZEDER Gábor" <szeder@ira.uka.de>,
git@vger.kernel.org, "Shawn O. Pearce" <spearce@spearce.org>,
Johannes.Schindelin@gmx.de
Subject: Re: [PATCH] builtin-commit: avoid using reduce_heads()
Date: Sat, 27 Sep 2008 02:16:17 +0200 [thread overview]
Message-ID: <20080927001617.GA6941@neumann> (raw)
In-Reply-To: <m37i8y3mqt.fsf@localhost.localdomain>
Hi all,
On Fri, Sep 26, 2008 at 09:17:39AM -0700, Jakub Narebski wrote:
> 3. Remove reduce_heads() from git-commit entirely, and record in
> MERGE_HEAD (or rather now MERGE_HEADS) _all_ _reduced_ heads.
> _All_ means that HEAD is included in MERGE_HEAD if it is not
> reduced, _reduced_ means that only non-dependent heads are in
> MERGE_HEAD. This for example means that for simple non-octopus
> merge case MERGE_HEAD/MERGE_HEADS now contain _all_ parents,
> and not only other side of merge.
>
> This solution has the advantage of being clear solution, clarifying
> semantic of MERGE_HEAD (currently HEAD is used both as target, i.e.
> where merge is to be recorded, and as one of heads to merge/to
> consider), and making it possible to separate layers: git-merge
> is about merging, git-commit doesn't need to know anything about
> merging.
Well, I'm just following this from the sidelines... but from design
point of view I would prefer #3 because of the clear separation of
the merge and commit steps.
Best,
Gábor
prev parent reply other threads:[~2008-09-27 0:17 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-09-25 23:50 [BUG] merge --no-ff --no-commit && commit SZEDER Gábor
2008-09-26 0:35 ` [PATCH] builtin-commit: avoid using reduce_heads() Miklos Vajna
2008-09-26 1:03 ` SZEDER Gábor
2008-09-26 6:24 ` Miklos Vajna
2008-09-26 15:15 ` Miklos Vajna
2008-09-26 15:20 ` [PATCH] builtin-commit: avoid always " Miklos Vajna
2008-09-26 15:52 ` Shawn O. Pearce
2008-09-26 19:37 ` Miklos Vajna
2008-10-03 2:35 ` Shawn O. Pearce
2008-10-03 12:04 ` Miklos Vajna
2008-10-03 14:59 ` Shawn O. Pearce
2008-10-05 19:51 ` Miklos Vajna
2008-10-06 14:19 ` Shawn O. Pearce
2008-10-03 15:09 ` [PATCH] builtin-commit: use reduce_heads() only when appropriate SZEDER Gábor
2008-10-05 19:43 ` Miklos Vajna
2008-09-26 16:17 ` [PATCH] builtin-commit: avoid using reduce_heads() Jakub Narebski
2008-09-26 19:31 ` Miklos Vajna
2008-09-26 23:51 ` Jakub Narebski
2008-09-29 15:07 ` Miklos Vajna
2008-09-29 18:18 ` Miklos Vajna
2008-09-29 18:44 ` Jakub Narebski
2008-09-27 0:16 ` SZEDER Gábor [this message]
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=20080927001617.GA6941@neumann \
--to=szeder@ira.uka.de \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=jnareb@gmail.com \
--cc=spearce@spearce.org \
--cc=vmiklos@frugalware.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 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 NNTP newsgroup(s).