[ANNOUNCE] Git v2.6.3

From: Junio C Hamano
Date: Thu Nov 05 2015 - 18:13:36 EST

The latest maintenance release Git v2.6.3 is now available at
the usual places. This contains bug & regression fixes that
have already been merged to the 'master' front.

The tarballs are found at:


The following public repositories all have a copy of the 'v2.6.3'
tag and the 'maint' branch that the tag points at:

url = https://kernel.googlesource.com/pub/scm/git/git
url = git://repo.or.cz/alt-git.git
url = git://git.sourceforge.jp/gitroot/git-core/git.git
url = git://git-core.git.sourceforge.net/gitroot/git-core/git-core
url = https://github.com/gitster/git


Git v2.6.3 Release Notes

Fixes since v2.6.2

* The error message from "git blame --contents --reverse" incorrectly
talked about "--contents --children".

* "git merge-file" tried to signal how many conflicts it found, which
obviously would not work well when there are too many of them.

* The name-hash subsystem that is used to cope with case insensitive
filesystems keeps track of directories and their on-filesystem
cases for all the paths in the index by holding a pointer to a
randomly chosen cache entry that is inside the directory (for its
ce->ce_name component). This pointer was not updated even when the
cache entry was removed from the index, leading to use after free.
This was fixed by recording the path for each directory instead of
borrowing cache entries and restructuring the API somewhat.

* When the "git am" command was reimplemented in C, "git am -3" had a
small regression where it is aborted in its error handling codepath
when underlying merge-recursive failed in some ways.

* The synopsis text and the usage string of subcommands that read
list of things from the standard input are often shown as if they
only take input from a file on a filesystem, which was misleading.

* A couple of commands still showed "[options]" in their usage string
to note where options should come on their command line, but we
spell that "[<options>]" in most places these days.

* The submodule code has been taught to work better with separate
work trees created via "git worktree add".

* When "git gc --auto" is backgrounded, its diagnosis message is
lost. It now is saved to a file in $GIT_DIR and is shown next time
the "gc --auto" is run.

* Work around "git p4" failing when the P4 depot records the contents
in UTF-16 without UTF-16 BOM.

* Recent update to "rebase -i" that tries to sanity check the edited
insn sheet before it uses it has become too picky on Windows where
CRLF left by the editor is turned into a trailing CR on the line
read via the "read" built-in command.

* "git clone --dissociate" runs a big "git repack" process at the
end, and it helps to close file descriptors that are open on the
packs and their idx files before doing so on filesystems that
cannot remove a file that is still open.

* Correct "git p4 --detect-labels" so that it does not fail to create
a tag that points at a commit that is also being imported.

* The internal stripspace() function has been moved to where it
logically belongs to, i.e. strbuf API, and the command line parser
of "git stripspace" has been updated to use the parse_options API.

* Prepare for Git on-disk repository representation to undergo
backward incompatible changes by introducing a new repository
format version "1", with an extension mechanism.

* "git gc" used to barf when a symbolic ref has gone dangling
(e.g. the branch that used to be your upstream's default when you
cloned from it is now gone, and you did "fetch --prune").

* The normalize_ceiling_entry() function does not muck with the end
of the path it accepts, and the real world callers do rely on that,
but a test insisted that the function drops a trailing slash.

* "git gc" is safe to run anytime only because it has the built-in
grace period to protect young objects. In order to run with no
grace period, the user must make sure that the repository is

* A recent "filter-branch --msg-filter" broke skipping of the commit
object header, which is fixed.

* "git --literal-pathspecs add -u/-A" without any command line
argument misbehaved ever since Git 2.0.

* 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.

* "git imap-send" did not compile well with older version of cURL library.

* The linkage order of libraries was wrong in places around libcurl.

* It was not possible to use a repository-lookalike created by "git
worktree add" as a local source of "git clone".

* When "git send-email" wanted to talk over Net::SMTP::SSL,
Net::Cmd::datasend() did not like to be fed too many bytes at the
same time and failed to send messages. Send the payload one line
at a time to work around the problem.

* 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.

* "git status --branch --short" accessed beyond the constant string
"HEAD", which has been corrected.

* "git daemon" uses "run_command()" without "finish_command()", so it
needs to release resources itself, which it forgot to do.

Also contains typofixes, documentation updates and trivial code


Changes since v2.6.2 are as follows:

David Turner (2):
t7063: fix flaky untracked-cache test
name-hash: don't reuse cache_entry in dir_entry

Dimitriy Ryazantcev (1):
l10n: ru.po: update Russian translation

James McCoy (1):
filter-branch: remove multi-line headers in msg filter

Jeff King (7):
introduce "extensions" form of core.repositoryformatversion
introduce "preciousObjects" repository extension
t6031: move triple-rename test to t3030
t6031: generalize for recursive and resolve strategies
merge: detect delete/modechange conflict
add_submodule_odb: initialize alt_odb list earlier
merge-file: clamp exit code to maximum 127

Johannes Schindelin (10):
t5700: demonstrate a Windows file locking issue with `git clone --dissociate`
sha1_file: consolidate code to close a pack's file descriptor
gc: demonstrate failure with stale remote HEAD
sha1_file.c: add a function to release all packs
clone --dissociate: avoid locking pack files
pack-objects: do not get distracted by broken symrefs
imap-send: only use CURLOPT_LOGIN_OPTIONS if it is actually available
Squelch warning about an integer overflow
Silence GCC's "cast of pointer to integer of a different size" warning
t3404: "rebase -i" gets broken when insn sheet uses CR/LF line endings

Junio C Hamano (10):
am -3: do not let failed merge from completing the error codepath
Documentation/gc: warn against --prune=<now>
usage: do not insist that standard input must come from a file
Documentation/everyday: match undefline with the text
Documentation: match underline with the text
Documentation: match undefline with the text in old release notes
Documentation: AsciiDoc spells em-dash as double-dashes, not triple
add: simplify -u/-A without pathspec
rebase-i: work around Windows CRLF line endings
Git 2.6.3

Lars Schneider (2):
git-p4: add test case for "Translation of file content failed" error
git-p4: handle "Translation of file content failed"

Luke Diamand (3):
git-p4: failing test for ignoring invalid p4 labels
git-p4: do not terminate creating tag for unknown commit
git-p4: fix P4 label import for unprocessed commits

Max Kirillov (3):
submodule refactor: use strbuf_git_path_submodule() in add_submodule_odb()
path: implement common_dir handling in git_pathdup_submodule()
blame: fix option name in error message

Nguyán ThÃi Ngác Duy (7):
path.c: delete an extra space
gc: save log from daemonized gc --auto and print it next time
t0002: add test for enter_repo(), non-strict mode
enter_repo: avoid duplicating logic, use is_git_directory() instead
enter_repo: allow .git files in strict mode
clone: allow --local from a linked checkout
clone: better error when --reference is a linked checkout

Ralf Thielow (1):
am, credential-cache: add angle brackets to usage string

Ray Donnelly (1):
test-path-utils.c: remove incorrect assumption

Remi Pommarel (3):
Makefile: link libcurl before zlib
Makefile: make curl-config path configurable
configure.ac: detect ssl need with libcurl

Renà Scharfe (7):
t7060: add test for status --branch on a detached HEAD
wt-status: exit early using goto in wt_shortstatus_print_tracking()
wt-status: avoid building bogus branch name with detached HEAD
wt-status: don't skip a magical number of characters blindly
wt-status: use skip_prefix() to get rid of magic string length constants
run-command: factor out child_process_clear()
daemon: plug memory leak

Sidhant Sharma (1):
worktree: usage: denote <branch> as optional with 'add'

Stefan Agner (1):
git-send-email.perl: Fixed sending of many/huge changes/patches

Tobias Klauser (2):
strbuf: make stripspace() part of strbuf
stripspace: use parse-options for command-line parsing

Waldek Maleska (1):
Correct fscanf formatting string for I64u values

Xue Fuqiao (2):
Documentation: fix header markup
user-manual: fix the description of fast-forward

To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/