From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 23 Apr 2012 19:52:54 +0000 (-0700)
Subject: Merge branch 'rs/commit-list-sort-in-batch'
X-Git-Tag: v1.7.11-rc0~125
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ba8e6326f16748d67fbeda65ffde4729760c64f0;p=git.git

Merge branch 'rs/commit-list-sort-in-batch'

Setting up a revision traversal with many starting points was inefficient
as these were placed in a date-order priority queue one-by-one.

By René Scharfe (3) and Junio C Hamano (1)
* rs/commit-list-sort-in-batch:
  mergesort: rename it to llist_mergesort()
  revision: insert unsorted, then sort in prepare_revision_walk()
  commit: use mergesort() in commit_list_sort_by_date()
  add mergesort() for linked lists
---

ba8e6326f16748d67fbeda65ffde4729760c64f0
diff --cc .gitignore
index 5a0782fe8,1787c8185..83a5c9df1
--- a/.gitignore
+++ b/.gitignore
@@@ -181,7 -180,9 +181,8 @@@
  /test-index-version
  /test-line-buffer
  /test-match-trees
+ /test-mergesort
  /test-mktemp
 -/test-obj-pool
  /test-parse-options
  /test-path-utils
  /test-run-command
diff --cc Makefile
index 172e924a2,330a7d5ae..f1caae8a8
--- a/Makefile
+++ b/Makefile
@@@ -481,7 -465,9 +481,8 @@@ TEST_PROGRAMS_NEED_X += test-genrando
  TEST_PROGRAMS_NEED_X += test-index-version
  TEST_PROGRAMS_NEED_X += test-line-buffer
  TEST_PROGRAMS_NEED_X += test-match-trees
+ TEST_PROGRAMS_NEED_X += test-mergesort
  TEST_PROGRAMS_NEED_X += test-mktemp
 -TEST_PROGRAMS_NEED_X += test-obj-pool
  TEST_PROGRAMS_NEED_X += test-parse-options
  TEST_PROGRAMS_NEED_X += test-path-utils
  TEST_PROGRAMS_NEED_X += test-run-command