receive-pack: use in_merge_bases() for fast-forward check
authorJunio C Hamano <gitster@pobox.com>
Mon, 27 Aug 2012 22:16:38 +0000 (15:16 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 28 Aug 2012 01:36:39 +0000 (18:36 -0700)
commit5d55915c7a58e59d913b0cfc38a6f49514068cd2
tree3e6e20c39310bb7b2dab95f72fca215c91ecb144
parenta20efee9cfcf9c68bb01d0aa82ffc7903d88bab4
receive-pack: use in_merge_bases() for fast-forward check

The original computed merge-base between the old commit and the new
commit and checked if the old commit was a merge base between them,
in order to make sure we are fast-forwarding.

Instead, call in_merge_bases(old, new) which does the same.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin/receive-pack.c