delta/git.git/commit.c, branch rj/sparse

Sync with 'maint'

2013-04-12T20:54:01+00:00

* maint:
  Correct common spelling mistakes in comments and tests
  kwset: fix spelling in comments
  precompose-utf8: fix spelling of "want" in error message
  compat/nedmalloc: fix spelling in comments
  compat/regex: fix spelling and grammar in comments
  obstack: fix spelling of similar
  contrib/subtree: fix spelling of accidentally
  git-remote-mediawiki: spelling fixes
  doc: various spelling fixes
  fast-export: fix argument name in error messages
  Documentation: distinguish between ref and offset deltas in pack-format
  i18n: make the translation of -u advice in one go

Correct common spelling mistakes in comments and tests

2013-04-12T20:38:40+00:00

Most of these were found using Lucas De Marchi's codespell tool.

Signed-off-by: Stefano Lattarini 
Signed-off-by: Jonathan Nieder 
Acked-by: Matthieu Moy 
Signed-off-by: Junio C Hamano

merge/pull Check for untrusted good GPG signatures

2013-04-01T05:38:49+00:00

When --verify-signatures is specified, abort the merge in case a good
GPG signature from an untrusted key is encountered.

Signed-off-by: Sebastian Götte 
Signed-off-by: Junio C Hamano

commit.c/GPG signature verification: Also look at the first GPG status line

2013-04-01T02:16:15+00:00

Signed-off-by: Sebastian Götte 
Signed-off-by: Junio C Hamano

Move commit GPG signature verification to commit.c

2013-04-01T02:15:11+00:00

Signed-off-by: Sebastian Götte 
Signed-off-by: Junio C Hamano

commit.c: use clear_commit_marks_many() in in_merge_bases_many()

2013-03-05T21:39:46+00:00

Signed-off-by: Junio C Hamano

commit.c: add in_merge_bases_many()

2013-03-05T21:39:46+00:00

Similar to in_merge_bases(commit, other) that returns true when
commit is an ancestor (i.e. in the merge bases between the two) of
the other commit, in_merge_bases_many(commit, n_other, other[])
checks if commit is an ancestor of any of the other[] commits.

Signed-off-by: Junio C Hamano

commit.c: add clear_commit_marks_many()

2013-03-05T21:39:45+00:00

clear_commit_marks(struct commit *, unsigned) only can clear flag
bits starting from a single commit; introduce an API to allow
feeding an array of commits, so that flag bits can be cleared from
commits reachable from any of them with a single traversal.

Signed-off-by: Junio C Hamano

Move print_commit_list to libgit.a

2012-10-29T07:08:30+00:00

This is used by bisect.c, part of libgit.a while it stays in
builtin/rev-list.c. Move it to commit.c so that we won't get undefined
reference if a program that uses libgit.a happens to pull it in.

Signed-off-by: Nguyễn Thái Ngọc Duy 
Signed-off-by: Jeff King

Merge branch 'jc/merge-bases-paint-fix'

2012-10-08T18:42:15+00:00

"git fmt-merge-msg" (an internal helper reduce_heads() it uses) had
a severe performance regression; an empty "git pull" took forever to
finish as the result.

* jc/merge-bases-paint-fix:
  paint_down_to_common(): parse commit before relying on its timestamp