• Junio C Hamano's avatar
    builtin/merge.c: reduce parents early · e78cbf8c
    Junio C Hamano authored
    Instead of waiting until we record the parents of resulting merge, reduce
    redundant parents (including our HEAD) immediately after reading them.
    The change to t7602 illustrates the essence of the effect of this change.
    The octopus merge strategy used to be fed with redundant commits only to
    discard them as "up-to-date", but we no longer feed such redundant commits
    to it and the affected test degenerates to a regular two-head merge.
    And obviously the known-to-be-broken test in t6028 is now fixed.
    Signed-off-by: default avatarJunio C Hamano <gitster@pobox.com>
t6028-merge-up-to-date.sh 1.67 KB