diff options
author | Jeff King <peff@peff.net> | 2011-06-11 19:04:08 +0000 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2011-06-11 22:32:25 -0700 |
commit | ffc4b8012d9a4f92ef238ff72c0d15e9e1b402ed (patch) | |
tree | 0abf78a61462305fa28ab83bf63ac2443136d5b5 /t/t3030-merge-recursive.sh | |
parent | Git 1.7.2-rc1 (diff) | |
download | tgif-ffc4b8012d9a4f92ef238ff72c0d15e9e1b402ed.tar.xz |
tag: speed up --contains calculation
When we want to know if commit A contains commit B (or any
one of a set of commits, B through Z), we generally
calculate the merge bases and see if B is a merge base of A
(or for a set, if any of the commits B through Z have that
property).
When we are going to check a series of commits A1 through An
to see whether each contains B (e.g., because we are
deciding which tags to show with "git tag --contains"), we
do a series of merge base calculations. This can be very
expensive, as we repeat a lot of traversal work.
Instead, let's leverage the fact that we are going to use
the same --contains list for each tag, and mark areas of the
commit graph is definitely containing those commits, or
definitely not containing those commits. Later tags can then
stop traversing as soon as they see a previously calculated
answer.
This sped up "git tag --contains HEAD~200" in the linux-2.6
repository from:
real 0m15.417s
user 0m15.197s
sys 0m0.220s
to:
real 0m5.329s
user 0m5.144s
sys 0m0.184s
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t3030-merge-recursive.sh')
0 files changed, 0 insertions, 0 deletions