diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-04-23 19:52:54 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-04-23 19:52:55 (GMT) |
| commit | ba8e6326f16748d67fbeda65ffde4729760c64f0 (patch) | |
| tree | cfd553f836c093db7d9f495127d972c688a398b0 /Makefile | |
| parent | 58bbace89d3e94a20faae4df0d20d57574dff6e1 (diff) | |
| parent | 7365c95d2d67cbbb74c2040918d2ecde06231d93 (diff) | |
| download | git-ba8e6326f16748d67fbeda65ffde4729760c64f0.zip git-ba8e6326f16748d67fbeda65ffde4729760c64f0.tar.gz git-ba8e6326f16748d67fbeda65ffde4729760c64f0.tar.bz2 | |
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
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -481,6 +481,7 @@ TEST_PROGRAMS_NEED_X += test-genrandom 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-parse-options TEST_PROGRAMS_NEED_X += test-path-utils @@ -591,6 +592,7 @@ LIB_H += log-tree.h LIB_H += mailmap.h LIB_H += merge-file.h LIB_H += merge-recursive.h +LIB_H += mergesort.h LIB_H += notes.h LIB_H += notes-cache.h LIB_H += notes-merge.h @@ -695,6 +697,7 @@ LIB_OBJS += mailmap.o LIB_OBJS += match-trees.o LIB_OBJS += merge-file.o LIB_OBJS += merge-recursive.o +LIB_OBJS += mergesort.o LIB_OBJS += name-hash.o LIB_OBJS += notes.o LIB_OBJS += notes-cache.o |