What's cooking in git.git (Apr 2013, #04; Fri, 12)
--
Here are the topics that have been cooking. Commits prefixed with
'-' are only in 'pu' (proposed updates) while commits prefixed with
'+' are in 'next'.
There are some topics posted on the list that do not appear here,
for various reasons, e.g. simply I ran out of time to pick them up,
it appeared we did not yet have consensus yet, the topic generated
enough comments and likely to be rerolled, or nobody seems to have
been interested in the topic yet. Also some of the new topics are
queued on 'pu' because I thought I'd have time to later review them,
but I actually haven't got around to review them carefully yet (I do
know that there are no malicious change in these topics).
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]
* po/help-guides (2013-04-03) 5 commits
(merged to 'next' on 2013-04-04 at 3d99b28)
+ doc: include --guide option description for git help
+ help: mention -a and -g option, and 'git help concept' usage.
+ builtin/help.c: add list_common_guides_help() function
+ builtin/help.c: add --guide option
+ builtin/help.c: split -a processing into two
git help learned -g option to show the list of guides just like
list of commands are given with -a.
* ap/combine-diff-coalesce-lost (2013-03-25) 1 commit
(merged to 'next' on 2013-03-29 at f6a05ca)
+ combine-diff: coalesce lost lines optimally
Attempts to minimize diff -c/--cc output by coalescing the same
lines removed from the parents better, but with an O(n^2)
complexity.
* js/rerere-forget-protect-against-NUL (2013-04-04) 2 commits
(merged to 'next' on 2013-04-05 at 426d4e2)
+ rerere forget: do not segfault if not all stages are present
+ rerere forget: grok files containing NUL
A few bugfixes to git rerere working on corner case merge
conflicts.
* sr/log-SG-no-textconv (2013-04-05) 6 commits
(merged to 'next' on 2013-04-05 at 7f06945)
+ diffcore-pickaxe: unify code for log -S/-G
+ diffcore-pickaxe: fix leaks in log -Sblock and log -Gpattern
+ diffcore-pickaxe: port optimization from has_changes() to diff_grep()
+ diffcore-pickaxe: respect --no-textconv
+ diffcore-pickaxe: remove fill_one()
+ diffcore-pickaxe: remove unnecessary call to get_textconv()
git log -S/-G started paying attention to textconv filter, but
there was no way to disable this. Make it honor --no-textconv
option.
--
[New Topics]
* po/help-guides (2013-04-12) 1 commit
- help: mark common_guides[] as translatable
Finishing touches.
Will fast-track to 'master'.
* ap/strbuf-humanize (2013-04-10) 2 commits
- count-objects: add -H option to humanize sizes
- strbuf: create strbuf_humanise_bytes() to show byte sizes
Teach --human-readable aka -H option to git count-objects to
show various large numbers in Ki/Mi/GiB scaled as necessary.
Will merge to 'next'.
It may not be a bad idea to discard mc/count-objects-kibibytes,
which can introduce regression to scripted users that expect the
output to say N kilobytes. Opinions?
* as/clone-reference-with-gitfile (2013-04-09) 2 commits
- clone: Allow repo using gitfile as a reference
- clone: Fix error message for reference repository
git clone did not work if a repository pointed at by the
--reference option is a gitfile that points at another place.
Waiting for comments.
* fc/transport-helper-error-reporting (2013-04-11) 3 commits
- transport-helper: improve push messages
- transport-helper: mention helper name when it dies
- transport-helper: report errors properly
Rerolled enough times. In-code comments may want to be further
extended to explain tricky parts, but seems to be ready otherwise.
Will merge to 'next'.
* jc/decorate (2013-04-07) 2 commits
- decorate: add clear_decoration()
- decorate: document API
(this branch is used by jc/gg.)
Will discard.
* jc/gg (2013-04-08) 3 commits
- commit: add get_commit_encoding()
- commit: rename parse_commit_date()
- commit: shrink indegree field
(this branch uses jc/decorate.)
Will discard.
* jk/doc-http-backend (2013-04-11) 2 commits
- doc/http-backend: give some lighttpd config examples
- doc/http-backend: clarify half-auth repo configuration
Improve documentation to illustrate push authenticated, fetch
anonymous configuration for smart HTTP servers.
Will merge to 'next'.
* jk/gitweb-utf8 (2013-04-08) 4 commits
- gitweb: Fix broken blob action parameters on blob/commitdiff pages
- gitweb: Don't append ';js=(0|1)' to external links
- gitweb: Make feed title valid utf8
- gitweb: Fix utf8 encoding for blob_plain, blobdiff_plain, commitdiff_plain,
and patch
Various fixes to gitweb.
Waiting for a reroll after a review.
* jk/submodule-subdirectory
