user/sven/git.git/commit.c, branch v1.7.3.5

Merge branch 'cc/find-commit-subject'

2010-08-18T19:46:55Z

* cc/find-commit-subject: blame: use find_commit_subject() instead of custom code merge-recursive: use find_commit_subject() instead of custom code bisect: use find_commit_subject() instead of custom code revert: rename variables related to subject in get_message() revert: refactor code to find commit subject in find_commit_subject() revert: fix off by one read when searching the end of a commit subject

revert: refactor code to find commit subject in find_commit_subject()

2010-07-23T23:09:28Z

Signed-off-by: Christian Couder Signed-off-by: Junio C Hamano

make commit_tree a library function

2010-04-02T06:53:54Z

Until now, this has been part of the commit-tree builtin. However, it is already used by other builtins (like commit, merge, and notes), and it would be useful to access it from library code. The check_valid helper has to come along, too, but is given a more library-ish name of "assert_sha1_type". Otherwise, the code is unchanged. There are still a few rough edges for a library function, like printing the utf8 warning to stderr, but we can address those if and when they come up as inappropriate. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano

Merge branch 'maint-1.6.5' into maint

2010-01-30T07:36:13Z

* maint-1.6.5: fix memcpy of overlapping area

fix memcpy of overlapping area

2010-01-29T17:52:21Z

Caught by valgrind in t5500, but it is pretty obvious from reading the code that this is shifting elements of an array to the left, which needs memmove. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano

Merge branch 'jh/notes' (early part)

2009-11-21T07:53:55Z

* 'jh/notes' (early part): Add selftests verifying concatenation of multiple notes for the same commit Refactor notes code to concatenate multiple notes annotating the same object Add selftests verifying that we can parse notes trees with various fanouts Teach the notes lookup code to parse notes trees with various fanout schemes Teach notes code to free its internal data structures on request Add '%N'-format for pretty-printing commit notes Add flags to get_commit_notes() to control the format of the note string t3302-notes-index-expensive: Speed up create_repo() fast-import: Add support for importing commit notes Teach "-m " and "-F " to "git notes edit" Add an expensive test for git-notes Speed up git notes lookup Add a script to edit/inspect notes Introduce commit notes Conflicts: .gitignore Documentation/pretty-formats.txt pretty.c

Merge branch 'sp/smart-http'

2009-11-21T07:51:23Z

* sp/smart-http: (37 commits) http-backend: Let gcc check the format of more printf-type functions. http-backend: Fix access beyond end of string. http-backend: Fix bad treatment of uintmax_t in Content-Length t5551-http-fetch: Work around broken Accept header in libcurl t5551-http-fetch: Work around some libcurl versions http-backend: Protect GIT_PROJECT_ROOT from /../ requests Git-aware CGI to provide dumb HTTP transport http-backend: Test configuration options http-backend: Use http.getanyfile to disable dumb HTTP serving test smart http fetch and push http tests: use /dumb/ URL prefix set httpd port before sourcing lib-httpd t5540-http-push: remove redundant fetches Smart HTTP fetch: gzip requests Smart fetch over HTTP: client side Smart push over HTTP: client side Discover refs via smart HTTP server when available http-backend: more explict LocationMatch http-backend: add example for gitweb on same URL http-backend: use mod_alias instead of mod_rewrite ... Conflicts: .gitignore remote-curl.c

Merge branch 'jc/maint-1.6.3-graft-trailing-space' into maint

2009-11-16T00:38:47Z

* jc/maint-1.6.3-graft-trailing-space: info/grafts: allow trailing whitespaces at the end of line

Merge branch 'jc/maint-1.6.3-graft-trailing-space'

2009-10-31T03:07:08Z

* jc/maint-1.6.3-graft-trailing-space: info/grafts: allow trailing whitespaces at the end of line

fetch-pack: Use a strbuf to compose the want list

2009-10-31T02:20:53Z

This change is being offered as a refactoring to make later commits in the smart HTTP series easier. By changing the enabled capabilities to be formatted in a strbuf it is easier to add a new capability to the set of supported capabilities. By formatting the want portion of the request into a strbuf and writing it as a whole block we can later decide to hold onto the req_buf (instead of releasing it) to recycle in stateless communications. Signed-off-by: Shawn O. Pearce Signed-off-by: Junio C Hamano