Here are the topics that have been cooking. Commits prefixed with
'-' are only in 'pu' (proposed updates) while commits prefixed with
'+' are in 'next'.
On the 'maint' front, a maintenance release 1.8.1.4 is out. The
same fixes are also included in the 'master' and upwards.
The tip of the 'master' is a bit past 1.8.2-rc0; new topics that are
not listed in this report are likely to be too late for the upcoming
release.
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
--
[New Topics]
* as/check-ignore (2013-02-19) 2 commits
- name-hash: allow hashing an empty string
- t0008: document test_expect_success_multi
git check-ignore . segfaulted, as a function it calls deep in its
callchain took a string in the ptr, length form but did not stop
when given an empty string.
Will merge to 'next' and will fast-track to 'master' (this is a new
feature in the upcoming release).
* bc/commit-complete-lines-given-via-m-option (2013-02-19) 4 commits
(merged to 'next' on 2013-02-19 at cf622b7)
+ Documentation/git-commit.txt: rework the --cleanup section
+ git-commit: only append a newline to -m mesg if necessary
+ t7502: demonstrate breakage with a commit message with trailing newlines
+ t/t7502: compare entire commit message with what was expected
'git commit -m $str' when $str was already terminated with a LF
now avoids adding an extra LF to the message.
Will merge to 'next'.
* ct/autoconf-htmldir (2013-02-19) 1 commit
- Bugfix: undefined htmldir in config.mak.autogen
An earlier change to config.mak.autogen broke a build driven by the
./configure script when --htmldir is not specified on the command
line of ./configure.
Will merge to 'next' and will fast-track to 'master' (this is a
regressin workaround).
* wk/user-manual (2013-02-19) 3 commits
(merged to 'next' on 2013-02-19 at dbc0eb2)
+ user-manual: Flesh out uncommitted changes and submodule updates
+ user-manual: Use request-pull to generate please pull text
+ user-manual: Reorganize the reroll sections, adding 'git rebase -i'
Further updates to the user manual.
Will merge to 'next'.
* wk/man-deny-current-branch-is-default-these-days (2013-02-18) 1 commit
- user-manual: typofix (ofthe-of the)
Will merge to 'next' and fast-track to 'master'.
--
[Graduated to master]
* jc/mention-tracking-for-pull-default (2013-01-31) 1 commit
(merged to 'next' on 2013-02-17 at 043624b)
+ doc: mention tracking for pull.default
We stopped mentioning `tracking` is a deprecated but supported
synonym for `upstream` in pull.default even though we have no
intention of removing the support for it.
* mm/config-intro-in-git-doc (2013-02-15) 1 commit
(merged to 'next' on 2013-02-17 at ff03eb5)
+ git.txt: update description of the configuration mechanism
--
[Stalled]
* mb/gitweb-highlight-link-target (2012-12-20) 1 commit
- Highlight the link target line in Gitweb using CSS
Expecting a reroll.
$gmane/211935
* jc/add-delete-default (2012-08-13) 1 commit
- git add: notice removal of tracked paths by default
git add dir/ updated modified files and added new files, but does
not notice removed files, which may be Huh? to some users. They
can of course use git add -A dir/, but why should they?
Resurrected from graveyard, as I thought it was a worthwhile thing
to do in the longer term.
There seems to be some interest. Let's see if it results in a solid
execution of a sensible transition plan towards Git 2.0.
* mb/remote-default-nn-origin (2012-07-11) 6 commits
- Teach get_default_remote to respect remote.default.
- Test that plain git fetch uses remote.default when on a detached HEAD.
- Teach clone to set remote.default.
- Teach git remote about remote.default.
- Teach remote.c about the remote.default configuration setting.
- Rename remote.c's default_remote_name static variables.
When the user does not specify what remote to interact with, we
often attempt to use 'origin'. This can now be customized via a
configuration variable.
Expecting a reroll.
$gmane/210151
The first remote becomes the default bit is better done as a
separate step.
--
[Cooking]
* da/difftool-fixes (2013-02-19) 4 commits
- t7800: defaults is no longer a builtin tool name
- t7800: modernize tests
- t7800: update copyright notice
- difftool: silence uninitialized variable warning
Minor maintenance updates to difftool, and updates to its tests.
* jk/smart-http-robustify (2013-02-17) 3 commits
- remote-curl: sanity check ref advertisement from server
- remote-curl: verify smart-http metadata lines
- pkt-line: teach packet_get_line a no-op mode
Parse the HTTP exchange that implements the native Git protocol as
a
