diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-08-27 15:16:38 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-08-27 18:36:39 -0700 |
| commit | 5d55915c7a58e59d913b0cfc38a6f49514068cd2 (patch) | |
| tree | 3e6e20c39310bb7b2dab95f72fca215c91ecb144 /t/t3031-merge-criscross.sh | |
| parent | in_merge_bases(): support only one "other" commit (diff) | |
| download | tgif-5d55915c7a58e59d913b0cfc38a6f49514068cd2.tar.xz | |
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>
Diffstat (limited to 't/t3031-merge-criscross.sh')
0 files changed, 0 insertions, 0 deletions