Here are the topics that have been cooking. Commits prefixed with
'-' are only in 'pu' (proposed updates) while commits prefixed with
'+' are in 'next'.
A handful of topics that have been stalled for quite a while have
been discarded; for those that are not superseded by something else,
interested parties can still resubmit a reroll, but without any
advances, we do not get any benefit from carrying them in my tree.
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"]
* bk/document-commit-tree-S (2013-03-25) 1 commit
(merged to 'next' on 2013-03-26 at 8ee205f)
+ commit-tree: document -S option consistently
* jc/apply-ws-fix-tab-in-indent (2013-03-29) 2 commits
(merged to 'next' on 2013-03-29 at 26eb6e9)
+ test: resurrect q_to_tab
(merged to 'next' on 2013-03-26 at 46c6bda)
+ apply --whitespace=fix: avoid running over the postimage buffer
"git apply --whitespace=fix" was not prepared to see a line getting
longer after fixing whitespaces (e.g. tab-in-indent aka Python).
* jc/directory-attrs-regression-fix (2013-03-28) 6 commits
(merged to 'next' on 2013-03-29 at a3dce2b)
+ t: check that a pattern without trailing slash matches a directory
+ dir.c::match_pathname(): pay attention to the length of string parameters
+ dir.c::match_pathname(): adjust patternlen when shifting pattern
+ dir.c::match_basename(): pay attention to the length of string parameters
+ attr.c::path_matches(): special case paths that end with a slash
+ attr.c::path_matches(): the basename is part of the pathname
Fix 1.8.1.x regression that stopped matching "dir" (without
trailing slash) to a directory "dir".
* jc/merge-tag-object (2013-04-01) 3 commits
(merged to 'next' on 2013-04-03 at 94b5c7d)
+ t6200: test message for merging of an annotated tag
+ t6200: use test_config/test_unconfig
(merged to 'next' on 2013-03-29 at aeec39c)
+ merge: a random object may not necssarily be a commit
"git merge $(git rev-parse v1.8.2)" behaved quite differently from
"git merge v1.8.2" as if v1.8.2 were written as v1.8.2^0 and did
not pay much attention to the annotated tag payload.
This makes the code notice the type of the tag object, in addition
to the dwim_ref() based classification the current code uses
(i.e. the name appears in refs/tags/) to decide when to special
case merging of tags.
* jc/sha1-name-object-peeler (2013-03-31) 2 commits
(merged to 'next' on 2013-04-01 at cdb4a18)
+ peel_onion(): teach $foo^{object} peeler
+ peel_onion: disambiguate to favor tree-ish when we know we want a tree-ish
(this branch is used by mh/rev-parse-verify-doc.)
There was no good way to ask "I have a random string that came from
outside world. I want to turn it into a 40-hex object name while
making sure such an object exists". A new peeling suffix ^{object}
can be used for that purpose, together with "rev-parse --verify".
* jc/t5516-pushInsteadOf-vs-pushURL (2013-03-28) 1 commit
(merged to 'next' on 2013-04-01 at bed2879)
+ t5516: test interaction between pushURL and pushInsteadOf correctly
Update a test to match the documented interaction between pushURL
and pushInsteadOf.
* jk/check-corrupt-objects-carefully (2013-03-29) 10 commits
(merged to 'next' on 2013-03-29 at b6a04a7)
+ clone: leave repo in place after checkout errors
+ clone: run check_everything_connected
+ clone: die on errors from unpack_trees
+ add tests for cloning corrupted repositories
+ streaming_write_entry: propagate streaming errors
+ add test for streaming corrupt blobs
+ avoid infinite loop in read_istream_loose
+ read_istream_filtered: propagate read error from upstream
+ check_sha1_signature: check return value from read_istream
+ stream_blob_to_fd: detect errors reading from stream
Have the streaming interface and other codepaths more carefully
examine for corrupt objects.
* jk/config-with-empty-section (2013-03-29) 1 commit
(merged to 'next' on 2013-04-01 at 7972aa9)
+ t1300: document some aesthetic failures of the config editor
Document that "git config --unset" does not remove an empty section
head after removing the last variable in a section, and adding a
new variable does not try to reuse a leftover empty section head.
* jk/difftool-no-overwrite-on-copyback (2013-03-29) 5 commits
(merged to 'next' on 2013-03-29 at 9f42d34)
+ t7800: run --dir-diff tests with and without symlinks
+ t7800: fix tests when difftool uses --no-symlinks
+ t7800: don't hide grep output
+ difftool: don't overwrite modified files
+ t7800: move '--symlinks' specific test to the end
Try to be careful when difftool backend allows the user to write
into the temporary files being shown *and* the user makes changes
to the working tree at the same time. One of the changes has to be
lost in such a case, but at least tell the us
