summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2012-06-08 14:56:03 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-06-13 14:04:33 -0700
commit6e513ba3a624a57fcf9e0f316ba54b3e0c951286 (patch)
tree9812db9bfb405d2eb8373a4368c0f485d8f2cec9 /t
parentrevision: note the lack of free() in simplify_merges() (diff)
downloadtgif-6e513ba3a624a57fcf9e0f316ba54b3e0c951286.tar.xz
revision: ignore side parents while running simplify-merges
The simplify_merges() function needs to look at all history chain to find the closest ancestor that is relevant after the simplification, but after --first-parent traversal, side parents haven't been marked for relevance (they are irrelevant by definition due to the nature of first-parent-only traversal) nor culled from the parents list of resulting commits. We cannot simply remove these side parents from the parents list, as the output phase still wants to see the parents. Instead, teach simplify_one() and its callees to ignore the later parents. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
0 files changed, 0 insertions, 0 deletions