git, branch v1.6.2-rc1

git-svn: Fix for rewriteRoot URL containing username.

2009-02-16T02:04:48Z

If the new svn root URL given with the svn-remote..rewriteRoot config option (or by the --rewrite-root option to 'git svn init') contains a username (such as 'svn+ssh://username@example.com/repo'), find_by_url() cannot find the repository URL, because the URL contained in the commit message does have the username removed. Signed-off-by: Dévai Tamás Acked-by: Eric Wong Signed-off-by: Junio C Hamano

builtin-receive-pack.c: fix compiler warnings about format string

2009-02-15T19:14:12Z

While all of the strings passed to warning() are, in fact, literals, the compiler doesn't recognize them as such because it doesn't see through the loop used to iterate over them: builtin-receive-pack.c: In function 'warn_unconfigured_deny': builtin-receive-pack.c:247: warning: format not a string literal and no format arguments builtin-receive-pack.c: In function 'warn_unconfigured_deny_delete_current': builtin-receive-pack.c:273: warning: format not a string literal and no format arguments Calm the compiler by adding easily recognizable format string literals. Signed-off-by: Rene Scharfe Signed-off-by: Junio C Hamano

RelNotes Update

2009-02-15T09:49:13Z

Signed-off-by: Junio C Hamano

Merge branch 'mc/setup-cd-p'

2009-02-15T09:44:58Z

* mc/setup-cd-p: git-sh-setup: Use "cd" option, not /bin/pwd, for symlinked work tree

Merge branch 'ff/submodule-no-fetch'

2009-02-15T09:44:20Z

* ff/submodule-no-fetch: submodule: add --no-fetch parameter to update command

Merge branch 'ms/mailmap'

2009-02-15T09:44:15Z

* ms/mailmap: Move mailmap documentation into separate file Change current mailmap usage to do matching on both name and email of author/committer. Add map_user() and clear_mailmap() to mailmap Add find_insert_index, insert_at_index and clear_func functions to string_list Add mailmap.file as configurational option for mailmap location

Merge branch 'jn/gitweb-committag'

2009-02-15T09:44:11Z

* jn/gitweb-committag: gitweb: Better regexp for SHA-1 committag match

Merge branch 'rc/http-push'

2009-02-15T09:43:57Z

* rc/http-push: use a hash of the lock token as the suffix for PUT/MOVE

use a hash of the lock token as the suffix for PUT/MOVE

2009-02-15T08:57:43Z

After 753bc91 ("Remove the requirement opaquelocktoken uri scheme"), lock tokens are in the URI forms in which they are received from the server, eg. 'opaquelocktoken:', 'urn:uuid:'. However, "start_put" (and consequently "start_move"), which attempts to create a unique temporary file using the UUID of the lock token, inadvertently uses the lock token in its URI form. These file operations on the server may not be successful (specifically, in Windows), due to the colon ':' character from the URI form of the lock token in the file path. This patch uses a hash of the lock token instead, guaranteeing only "safe" characters (a-f, 0-9) are used in the file path. The token's hash is generated when the lock token is received from the server in handle_new_lock_ctx, minimizing the number of times of hashing. Signed-off-by: Tay Ray Chuan Signed-off-by: Junio C Hamano

Merge branch 'js/gc-prune'

2009-02-15T08:05:11Z

* js/gc-prune: gc: make --prune useful again by accepting an optional parameter