summaryrefslogtreecommitdiff
path: root/builtin/clone.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2012-07-11 12:46:57 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-07-11 12:46:57 -0700
commitc8382c1500be51a869eb87feb00210c8d5a05a31 (patch)
tree70dd4f7a10e3b89a86aa3bd78ae71c394a8f55b4 /builtin/clone.c
parentMerge branch 'hv/submodule-update-nuke-submodules' into maint (diff)
parentrevision: ignore side parents while running simplify-merges (diff)
downloadtgif-c8382c1500be51a869eb87feb00210c8d5a05a31.tar.xz
Merge branch 'jc/rev-list-simplify-merges-first-parent' into maint
When "git log" gets "--simplify-merges/by-decoration" together with "--first-parent", the combination of these options makes the simplification logic to use in-core commit objects that haven't been examined for relevance, either producing incorrect result or taking too long to produce any output. Teach the simplification logic to ignore commits that the first-parent traversal logic ignored when both are in effect to work around the issue. * jc/rev-list-simplify-merges-first-parent: revision: ignore side parents while running simplify-merges revision: note the lack of free() in simplify_merges() revision: "simplify" options imply topo-order sort
Diffstat (limited to 'builtin/clone.c')
0 files changed, 0 insertions, 0 deletions