git/commit.c, branch v1.7.11

ident: rename IDENT_ERROR_ON_NO_NAME to IDENT_STRICT

2012-05-25T00:16:41Z

Callers who ask for ERROR_ON_NO_NAME are not so much concerned that the name will be blank (because, after all, we will fall back to using the username), but rather it is a check to make sure that low-quality identities do not end up in things like commit messages or emails (whereas it is OK for them to end up in things like reflogs). When future commits add more quality checks on the identity, each of these callers would want to use those checks, too. Rather than modify each of them later to add a new flag, let's refactor the flag. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano

commit: remove commit_list_reverse()

2012-04-25T21:51:21Z

The function commit_list_reverse() is not used anymore; delete it. Signed-off-by: Rene Scharfe Signed-off-by: Junio C Hamano

sequencer: export commit_list_append()

2012-04-25T21:51:17Z

This function can be used in other parts of git. Give it a new home in commit.c. Signed-off-by: Rene Scharfe Signed-off-by: Junio C Hamano

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

2012-04-23T19:52:55Z

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

mergesort: rename it to llist_mergesort()

2012-04-17T18:07:01Z

Even though the function is generic enough, sort() inherits connotations from the standard function qsort() that sorts an array. Rename it to llist_mergesort() and describe the external interface in its header file. This incidentally avoids name clashes with mergesort() some platforms declare in, and contaminate user namespace with, their . Reported-by: Brian Gernhardt Signed-off-by: Junio C Hamano

revision: insert unsorted, then sort in prepare_revision_walk()

2012-04-11T15:50:54Z

Speed up prepare_revision_walk() by adding commits without sorting to the commit_list and at the end sort the list in one go. Thanks to mergesort() working behind the scenes, this is a lot faster for large numbers of commits than the current insert sort. Also introduce and use commit_list_reverse(), to keep the ordering of commits sharing the same commit date unchanged. That's because commit_list_insert_by_date() sorts commits with descending date, but adds later entries with the same date entries last, while commit_list_insert() always inserts entries at the top. The following commit_list_sort_by_date() keeps the order of entries sharing the same date. Jeff's test case, in a repo with lots of refs, was to run: # make a new commit on top of HEAD, but not yet referenced sha1=`git commit-tree HEAD^{tree} -p HEAD Signed-off-by: Junio C Hamano

commit: use mergesort() in commit_list_sort_by_date()

2012-04-11T15:50:54Z

Replace the insertion sort in commit_list_sort_by_date() with a call to the generic mergesort function. This sets the stage for using commit_list_sort_by_date() for larger lists, as shown in the next patch. Signed-off-by: Rene Scharfe Signed-off-by: Junio C Hamano

Merge branch 'nd/index-pack-no-recurse'

2012-01-29T21:18:56Z

* nd/index-pack-no-recurse: index-pack: eliminate unlimited recursion in get_base_data() index-pack: eliminate recursion in find_unresolved_deltas Eliminate recursion in setting/clearing marks in commit list

Eliminate recursion in setting/clearing marks in commit list

2012-01-16T22:27:24Z

Recursion in a DAG is generally a bad idea because it could be very deep. Be defensive and avoid recursion in mark_parents_uninteresting() and clear_commit_marks(). mark_parents_uninteresting() learns a trick from clear_commit_marks() to avoid malloc() in (dominant) single-parent case. Signed-off-by: Nguyễn Thái Ngọc Duy Signed-off-by: Junio C Hamano

Merge branch 'jc/show-sig'

2012-01-06T20:44:07Z

* jc/show-sig: log --show-signature: reword the common two-head merge case log-tree: show mergetag in log --show-signature output log-tree.c: small refactor in show_signature() commit --amend -S: strip existing gpgsig headers verify_signed_buffer: fix stale comment gpg-interface: allow use of a custom GPG binary pretty: %G[?GS] placeholders test "commit -S" and "log --show-signature" log: --show-signature commit: teach --gpg-sign option Conflicts: builtin/commit-tree.c builtin/commit.c builtin/merge.c notes-cache.c pretty.c