Here are the topics that have been cooking. Commits prefixed with '-' are
@ -11,14 +11,62 @@ only in 'pu' while commits prefixed with '+' are in 'next'. The ones
@@ -11,14 +11,62 @@ only in 'pu' 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.
There shouldn't be anything exciting to see here right now. Please test
"master" branch to avoid giving regressions to end users; we are at
1.7.0-rc2 and I am hoping that we can release the 1.7.0 on the 10th.
Now 1.7.0 is out, we will take a short pause and watch breakage reports
for a few days, and then start merging down new topics.
Many of these have been parked in 'pu' during the pre-release freeze.
They will start migrating to 'next' shortly.
* sp/maint-push-sideband (2010-02-10) 8 commits
- receive-pack: Send internal errors over side-band #2
- t5401: Use a bare repository for the remote peer
- receive-pack: Send hook output over side band #2
- receive-pack: Wrap status reports inside side-band-64k
- receive-pack: Refactor how capabilities are shown to the client
@ -27,13 +75,12 @@ There shouldn't be anything exciting to see here right now. Please test
@@ -27,13 +75,12 @@ There shouldn't be anything exciting to see here right now. Please test
- run-command: Allow stderr to be a caller supplied pipe
(this branch is used by sp/push-sideband.)
Based on 1.6.5 maintenance track
Based on 1.6.5 maintenance track.
* sp/push-sideband (2010-02-05) 0 commits
* sp/push-sideband (2010-02-10) 0 commits
(this branch uses sp/maint-push-sideband.)
And my conflict resolution in #ifdef WINDOWS codepath (meaning: untested,
please check).
And my conflict resolution in #ifdef WINDOWS codepath.