]> git.ipfire.org Git - thirdparty/git.git/commit - http-push.c
http-push: use in_merge_bases() for fast-forward check
authorJunio C Hamano <gitster@pobox.com>
Mon, 27 Aug 2012 22:21:37 +0000 (15:21 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 28 Aug 2012 01:36:39 +0000 (18:36 -0700)
commit6571225137b1ba270b49a0dfc6a30aab6f4b86ba
treebfc6be12df7a548eb0bfcd334d02b32b87e59318
parent5d55915c7a58e59d913b0cfc38a6f49514068cd2
http-push: use in_merge_bases() for fast-forward check

The original computed merge-base between HEAD and the remote ref and
checked if the remote ref is a merge base between them, in order to
make sure that we are fast-forwarding.

Instead, call in_merge_bases(remote, HEAD) which does the same.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
http-push.c