Merge branch 'jc/merge-bases'
authorJunio C Hamano <gitster@pobox.com>
Tue, 11 Sep 2012 18:35:26 +0000 (11:35 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 11 Sep 2012 18:36:05 +0000 (11:36 -0700)
commit34f5130af84f7a37fba327d5a5be4f4427dc6886
tree1f8836fe7fb70566e31b3f4f5d1475fabd95981b
parent0083f1d43a7280aefa23656eaac7266139484b24
parentf37d3c755209234acfc2ca280027ebdab8e9ea8a
Merge branch 'jc/merge-bases'

Optimise the "merge-base" computation a bit, and also update its
users that do not need the full merge-base information to call a
cheaper subset.

* jc/merge-bases:
  reduce_heads(): reimplement on top of remove_redundant()
  merge-base: "--is-ancestor A B"
  get_merge_bases_many(): walk from many tips in parallel
  in_merge_bases(): use paint_down_to_common()
  merge_bases_many(): split out the logic to paint history
  in_merge_bases(): omit unnecessary redundant common ancestor reduction
  http-push: use in_merge_bases() for fast-forward check
  receive-pack: use in_merge_bases() for fast-forward check
  in_merge_bases(): support only one "other" commit
builtin/branch.c
builtin/fetch.c
builtin/merge-base.c
builtin/receive-pack.c
commit.c
commit.h
contrib/examples/builtin-fetch--tool.c
fast-import.c
http-push.c
submodule.c