From: Junio C Hamano <gitster@pobox.com>
To: Miklos Vajna <vmiklos@frugalware.org>
Cc: Johannes Schindelin <Johannes.Schindelin@gmx.de>, git@vger.kernel.org
Subject: Re: [PATCH] Introduce get_octopus_merge_bases() in commit.c
Date: Mon, 09 Jun 2008 15:55:47 -0700 [thread overview]
Message-ID: <7vd4mqfcb0.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: <1213051426-11530-1-git-send-email-vmiklos@frugalware.org> (Miklos Vajna's message of "Tue, 10 Jun 2008 00:43:46 +0200")
Miklos Vajna <vmiklos@frugalware.org> writes:
> Exactly. I modified merge_bases_many() to use a commit list.
I just looked at your f755fb6; from the point of view of merge_bases()
which is far more often used, I think this is not an improvement but
actively wrong thing to do. Most of the time callers compute merge base
of two, and the codepath should be optimized for that case.
next prev parent reply other threads:[~2008-06-09 22:56 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-06-05 20:44 [PATCH 00/10] Build in merge Miklos Vajna
2008-06-05 20:44 ` [PATCH 01/10] Move split_cmdline() to alias.c Miklos Vajna
2008-06-05 20:44 ` [PATCH 02/10] Move commit_list_count() to commit.c Miklos Vajna
2008-06-05 20:44 ` [PATCH 03/10] Move builtin-remote's skip_prefix() to git-compat-util.h Miklos Vajna
2008-06-05 20:44 ` [PATCH 04/10] Add new test to ensure git-merge handles pull.twohead and pull.octopus Miklos Vajna
2008-06-05 20:44 ` [PATCH 05/10] parseopt: add a new PARSE_OPT_ARGV0_IS_AN_OPTION option Miklos Vajna
2008-06-05 20:44 ` [PATCH 06/10] Move read_cache_unmerged() to read-cache.c Miklos Vajna
2008-06-05 20:44 ` [PATCH 07/10] git-fmt-merge-msg: make it useable from other builtins Miklos Vajna
2008-06-05 20:44 ` [PATCH 08/10] Introduce commit_list_append() in commit.c Miklos Vajna
2008-06-05 20:44 ` [PATCH 09/10] Introduce get_octopus_merge_bases() " Miklos Vajna
2008-06-05 20:44 ` [PATCH 10/10] Build in merge Miklos Vajna
2008-06-06 3:51 ` [PATCH 09/10] Introduce get_octopus_merge_bases() in commit.c Junio C Hamano
2008-06-06 5:53 ` Junio C Hamano
2008-06-06 12:28 ` Johannes Schindelin
2008-06-06 12:36 ` Johannes Schindelin
2008-06-06 15:36 ` Junio C Hamano
2008-06-07 21:38 ` [PATCH] " Miklos Vajna
2008-06-09 14:02 ` Johannes Schindelin
2008-06-09 22:43 ` Miklos Vajna
2008-06-09 22:55 ` Junio C Hamano [this message]
2008-06-09 23:08 ` Johannes Schindelin
2008-06-09 23:20 ` Junio C Hamano
2008-06-09 23:35 ` Miklos Vajna
2008-06-09 23:06 ` Junio C Hamano
2008-06-09 23:25 ` Miklos Vajna
2008-06-09 23:31 ` Johannes Schindelin
2008-06-09 23:41 ` Junio C Hamano
2008-06-10 0:03 ` Miklos Vajna
2008-06-10 2:43 ` Johannes Schindelin
2008-06-06 12:30 ` [PATCH 09/10] " Johannes Schindelin
2008-06-07 2:30 ` Miklos Vajna
2008-06-05 23:16 ` [PATCH 08/10] Introduce commit_list_append() " Junio C Hamano
2008-06-06 23:52 ` Miklos Vajna
2008-06-07 0:14 ` Junio C Hamano
2008-06-07 2:03 ` Miklos Vajna
2008-06-05 23:12 ` [PATCH 07/10] git-fmt-merge-msg: make it useable from other builtins Junio C Hamano
2008-06-07 1:04 ` Miklos Vajna
2008-06-09 8:58 ` Andreas Ericsson
2008-06-09 22:53 ` [PATCH] git-fmt-merge-msg: make it usable " Miklos Vajna
2008-06-05 23:05 ` [PATCH 06/10] Move read_cache_unmerged() to read-cache.c Junio C Hamano
2008-06-07 1:00 ` [PATCH] " Miklos Vajna
2008-06-05 22:58 ` [PATCH 04/10] Add new test to ensure git-merge handles pull.twohead and pull.octopus Junio C Hamano
2008-06-07 0:47 ` [PATCH] " Miklos Vajna
2008-06-05 22:38 ` [PATCH 03/10] Move builtin-remote's skip_prefix() to git-compat-util.h Junio C Hamano
2008-06-06 23:42 ` [PATCH] Move parse-options's " Miklos Vajna
-- strict thread matches above, loose matches on Subject: below --
2008-06-11 20:50 [PATCH 08/10] Introduce get_octopus_merge_bases() in commit.c Miklos Vajna
2008-06-11 21:17 ` [PATCH] " Miklos Vajna
2008-06-11 23:51 ` Junio C Hamano
2008-06-12 16:59 ` Miklos Vajna
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=7vd4mqfcb0.fsf@gitster.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.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.
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).