Here are the topics that have been cooking. Commits prefixed with
'-' are only in 'pu' (proposed updates) while commits prefixed with
'+' are in 'next'. The ones marked with '.' do not appear in any of
the integration branches, but I am still holding onto them.
You can find the changes described here in the integration branches
of the repositories listed at
http://git-blame.blogspot.com/p/git-public-repositories.html
--
[Graduated to "master"]
* ab/gitweb-abbrev-links (2016-10-14) 3 commits
(merged to 'next' on 2016-10-17 at 4868def05e)
+ gitweb: link to "git describe"'d commits in log messages
+ gitweb: link to 7-char+ SHA-1s, not only 8-char+
+ gitweb: fix a typo in a comment
In addition to purely abbreviated commit object names, "gitweb"
learned to turn "git describe" output (e.g. v2.9.3-599-g2376d31787)
into clickable links in its output.
* bw/ls-files-recurse-submodules (2016-10-10) 4 commits
(merged to 'next' on 2016-10-17 at f0e398946a)
+ ls-files: add pathspec matching for submodules
+ ls-files: pass through safe options for --recurse-submodules
+ ls-files: optionally recurse into submodules
+ git: make super-prefix option
"git ls-files" learned "--recurse-submodules" option that can be
used to get a listing of tracked files across submodules (i.e. this
only works with "--cached" option, not for listing untracked or
ignored files). This would be a useful tool to sit on the upstream
side of a pipe that is read with xargs to work on all working tree
files from the top-level superproject.
* bw/submodule-branch-dot-doc (2016-10-19) 1 commit
(merged to 'next' on 2016-10-21 at 18aad25ba8)
+ submodules doc: update documentation for "." used for submodule branches
Recent git allows submodule..branch to use a special token
"." instead of the branch name; the documentation has been updated
to describe it.
* dk/worktree-dup-checkout-with-bare-is-ok (2016-10-14) 1 commit
(merged to 'next' on 2016-10-17 at 24594d3e56)
+ worktree: allow the main brach of a bare repository to be checked out
In a worktree connected to a repository elsewhere, created via "git
worktree", "git checkout" attempts to protect users from confusion
by refusing to check out a branch that is already checked out in
another worktree. However, this also prevented checking out a
branch, which is designated as the primary branch of a bare
reopsitory, in a worktree that is connected to the bare
repository. The check has been corrected to allow it.
* ex/deprecate-empty-pathspec-as-match-all (2016-06-22) 1 commit
(merged to 'next' on 2016-09-21 at e19148ea63)
+ pathspec: warn on empty strings as pathspec
Originally merged to 'next' on 2016-07-13
An empty string used as a pathspec element has always meant
'everything matches', but it is too easy to write a script that
finds a path to remove in $path and run 'git rm "$paht"', which
ends up removing everything. Start warning about this use of an
empty string used for 'everything matches' and ask users to use a
more explicit '.' for that instead.
The hope is that existing users will not mind this change, and
eventually the warning can be turned into a hard error, upgrading
the deprecation into removal of this (mis)feature.
* jc/cocci-xstrdup-or-null (2016-10-12) 1 commit
(merged to 'next' on 2016-10-17 at 55ceaa465a)
+ cocci: refactor common patterns to use xstrdup_or_null()
Code cleanup.
* jc/diff-unique-abbrev-comments (2016-09-30) 1 commit
(merged to 'next' on 2016-10-17 at c7fb286102)
+ diff_unique_abbrev(): document its assumption and limitation
(this branch is used by jk/no-looking-at-dotgit-outside-repo.)
A bit more comments in a tricky code.
* jc/ws-error-highlight (2016-10-04) 4 commits
(merged to 'next' on 2016-10-17 at ecbdc57d77)
+ diff: introduce diff.wsErrorHighlight option
+ diff.c: move ws-error-highlight parsing helpers up
+ diff.c: refactor parse_ws_error_highlight()
+ t4015: split out the "setup" part of ws-error-highlight test
"git diff/log --ws-error-highlight=" lacked the corresponding
configuration variable to set it by default.
* jk/ambiguous-short-object-names (2016-10-12) 1 commit
(merged to 'next' on 2016-10-19 at e7c55a9da5)
+ t1512: become resilient to GETTEXT_POISON build
A test fixup to recently graduated topic.
* jk/diff-submodule-diff-inline (2016-10-20) 1 commit
(merged to 'next' on 2016-10-21 at 13f300805e)
+ rev-list: use hdr_termination instead of a always using a newline
A recently graduated topic regressed "git rev-list --header"
output, breaking "gitweb". This has been fixed.
* jk/fetch-quick-tag-following (2016-10-14) 1 commit
(merged to 'next' on 2016-10-19 at d7718dcdf5)
+ fetch: use "quick" has_sha1_file for tag following
When fetching from a remote that has many tags that are irrelevant
to branches we are following, we used to waste way too many cycles
when checking if the object poin
