git, branch v2.6.3

Git 2.6.3

2015-11-05T20:20:34Z

Signed-off-by: Junio C Hamano

Merge branch 'rs/daemon-plug-child-leak' into maint

2015-11-05T20:18:17Z

"git daemon" uses "run_command()" without "finish_command()", so it needs to release resources itself, which it forgot to do. * rs/daemon-plug-child-leak: daemon: plug memory leak run-command: factor out child_process_clear()

Merge branch 'rs/wt-status-detached-branch-fix' into maint

2015-11-05T20:18:15Z

"git status --branch --short" accessed beyond the constant string "HEAD", which has been corrected. * rs/wt-status-detached-branch-fix: wt-status: use skip_prefix() to get rid of magic string length constants wt-status: don't skip a magical number of characters blindly wt-status: avoid building bogus branch name with detached HEAD wt-status: exit early using goto in wt_shortstatus_print_tracking() t7060: add test for status --branch on a detached HEAD

Merge branch 'jk/initialization-fix-to-add-submodule-odb' into maint

2015-11-05T20:18:14Z

We peek objects from submodule's object store by linking it to the list of alternate object databases, but the code to do so forgot to correctly initialize the list. * jk/initialization-fix-to-add-submodule-odb: add_submodule_odb: initialize alt_odb list earlier

Merge branch 'js/misc-fixes' into maint

2015-11-05T20:18:13Z

Various compilation fixes and squelching of warnings. * js/misc-fixes: Correct fscanf formatting string for I64u values Silence GCC's "cast of pointer to integer of a different size" warning Squelch warning about an integer overflow

Merge branch 'jc/add-u-A-default-to-top' into maint

2015-11-05T20:18:12Z

"git --literal-pathspecs add -u/-A" without any command line argument misbehaved ever since Git 2.0. * jc/add-u-A-default-to-top: add: simplify -u/-A without pathspec

Merge branch 'jk/delete-modechange-conflict' into maint

2015-11-05T20:18:11Z

Merging a branch that removes a path and another that changes the mode bits on the same path should have conflicted at the path, but it didn't and silently favoured the removal. * jk/delete-modechange-conflict: merge: detect delete/modechange conflict t6031: generalize for recursive and resolve strategies t6031: move triple-rename test to t3030

Merge branch 'js/imap-send-curl-compilation-fix' into maint

2015-11-05T20:18:10Z

"git imap-send" did not compile well with older version of cURL library. * js/imap-send-curl-compilation-fix: imap-send: only use CURLOPT_LOGIN_OPTIONS if it is actually available

Merge branch 'rp/link-curl-before-ssl' into maint

2015-11-05T20:18:09Z

The linkage order of libraries was wrong in places around libcurl. * rp/link-curl-before-ssl: configure.ac: detect ssl need with libcurl Makefile: make curl-config path configurable Makefile: link libcurl before zlib

Merge branch 'nd/clone-linked-checkout' into maint

2015-11-05T20:18:08Z

It was not possible to use a repository-lookalike created by "git worktree add" as a local source of "git clone". * nd/clone-linked-checkout: clone: better error when --reference is a linked checkout clone: allow --local from a linked checkout enter_repo: allow .git files in strict mode enter_repo: avoid duplicating logic, use is_git_directory() instead t0002: add test for enter_repo(), non-strict mode path.c: delete an extra space