summaryrefslogtreecommitdiff
path: root/t/t1013/objects/2e/65efe2a145dda7ee51d1741299f848e5bf752e
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2012-04-17 12:22:26 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-04-17 17:15:05 -0700
commite78cbf8cbb61edfbdef5d33262f9b8cf02a3afca (patch)
tree4cf4a58f041d62e22f3876bd4c0c536257f4a331 /t/t1013/objects/2e/65efe2a145dda7ee51d1741299f848e5bf752e
parentbuiltin/merge.c: collect other parents early (diff)
downloadtgif-e78cbf8cbb61edfbdef5d33262f9b8cf02a3afca.tar.xz
builtin/merge.c: reduce parents early
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: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t1013/objects/2e/65efe2a145dda7ee51d1741299f848e5bf752e')
0 files changed, 0 insertions, 0 deletions