From: Junio C Hamano <gitster@pobox.com>
To: git@vger.kernel.org
Cc: Thomas Rast <trast@student.ethz.ch>, Jeff King <peff@peff.net>
Subject: [PATCH 0/5] optimize fast-forward checks
Date: Mon, 27 Aug 2012 16:11:58 -0700 [thread overview]
Message-ID: <1346109123-12357-1-git-send-email-gitster@pobox.com> (raw)
This is a follow-up to $gmane/204149; somehow the discussion petered
out, but I think this topic (and also "tag --contains" that was not
really discussed) needs to be looked into. Here is a first baby
step.
- The first one is an obvious simplification; we never supported
more than one "reference" commits and no caller had to invent a
loop around it to emulate multi-reference in_merge_base().
- The two patches that follow are the uses of get_merge_bases()
where in_merge_bases() is sufficient. These callers are not
interested in the merge bases between the two points; they only
want to know if one point is an ancestor of the other.
- The next one [4/5] should be identical to Thomas's patch.
- The last one attempts to reduce the cost of postprocessing from
N*(N-1) to N, but it somehow breaks 6010. I haven't looked into
why. They say all bugs are shallow given enough eyeballs, so I
am sending it out to see if that is true ;-)
Junio C Hamano (5):
in_merge_bases(): support only one "other" commit
receive-pack: use in_merge_bases() for fast-forward check
http-push: use in_merge_bases() for fast-forward check
in_merge_bases(): omit unnecessary redundant common ancestor
reduction
(BROKEN) get_merge_bases_many(): walk from many tips in parallel
builtin/branch.c | 4 +--
builtin/fetch.c | 2 +-
builtin/receive-pack.c | 8 +----
commit.c | 60 ++++++++++++++++++++--------------
commit.h | 2 +-
contrib/examples/builtin-fetch--tool.c | 2 +-
fast-import.c | 2 +-
http-push.c | 3 +-
submodule.c | 12 +++----
9 files changed, 49 insertions(+), 46 deletions(-)
--
1.7.12.116.g31e0100
next reply other threads:[~2012-08-27 23:12 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-08-27 23:11 Junio C Hamano [this message]
2012-08-27 23:11 ` [PATCH 1/5] in_merge_bases(): support only one "other" commit Junio C Hamano
2012-08-27 23:12 ` [PATCH 2/5] receive-pack: use in_merge_bases() for fast-forward check Junio C Hamano
2012-08-27 23:12 ` [PATCH 3/5] http-push: " Junio C Hamano
2012-08-27 23:12 ` [PATCH 4/5] in_merge_bases(): omit unnecessary redundant common ancestor reduction Junio C Hamano
2012-08-27 23:12 ` [PATCH 5/5] (BROKEN) get_merge_bases_many(): walk from many tips in parallel Junio C Hamano
2012-08-28 1:25 ` Junio C Hamano
2012-08-28 21:35 ` Junio C Hamano
2012-08-28 23:39 ` Junio C Hamano
2012-08-29 11:08 ` Jeff King
2012-08-29 11:10 ` [PATCH 1/2] basic priority queue implementation Jeff King
2012-08-29 11:11 ` [PATCH 2/2] commit: use a priority queue in merge base functions Jeff King
2012-08-29 16:36 ` Junio C Hamano
2012-08-29 20:53 ` Jeff King
2012-08-29 20:55 ` Jeff King
2012-08-29 21:00 ` Jeff King
2012-08-29 21:05 ` Jeff King
2012-08-30 12:54 ` Jeff King
2012-08-30 13:03 ` Jeff King
2012-08-30 13:24 ` Jeff King
2012-08-30 16:33 ` Junio C Hamano
2012-08-30 21:48 ` Jeff King
2012-08-30 22:16 ` Junio C Hamano
2012-08-30 16:23 ` Junio C Hamano
2012-08-30 21:31 ` Jeff King
2012-08-30 21:59 ` Junio C Hamano
2012-08-29 21:18 ` 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=1346109123-12357-1-git-send-email-gitster@pobox.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=peff@peff.net \
--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.
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).