kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

What's cooking (2015/12 #01)

todo
Jeff King 2015-12-01 19:20:05 -05:00
parent 9dd6b0e43a
commit 8e1d110250
1 changed files with 354 additions and 292 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

646
whats-cooking.txt
View File

@ -1,29 +1,19 @@
To: git@vger.kernel.org
Bcc: lwn@lwn.net
Subject: What's cooking in git.git (Nov 2015, #04; Tue, 24)
X-master-at: 1bc8feaa7cc752fe3b902ccf83ae9332e40921db
X-next-at: ac6eb1c9efff97a4f02a0d094c9cc5fe314d4449
Subject: What's cooking in git.git (Dec 2015, #01; Tue, 1)
X-master-at: fd13a2ecfbda734a54e22695e0219e89682bdd22
X-next-at: a22bf4777ab14f7322ba61781952635899ef89e7

What's cooking in git.git (Nov 2015, #04; Tue, 24)
What's cooking in git.git (Dec 2015, #01; Tue, 1)
--------------------------------------------------

Here are the topics that have been cooking. Commits prefixed with
'-' are only in 'pu' (proposed updates) while commits prefixed with
'+' are in 'next'.

Sorry for the extreme delay in pushing out my tree. I ended up busier
than I expected during the first week of Junio's absence, and then it
took me a while to dig myself out of the ever-filling hole of incoming
topics. :)

Expect quite a few new topics in this edition. A number of them have
seen review already, and I'm planning to merge them to "next" fairly
quickly (I may do another integration cycle late tonight or tomorrow
with those changes).

I still have a few threads to comb through on the list. If you don't see
the latest version of your topic here, please feel free to ping me, or
to repost.
This should by my final whats-cooking before handing things back to
Junio. Thanks all for review help and for your patience during the past
few weeks.

You can find the normal integration branches at:

@ -38,12 +28,111 @@ But note that I will _not_ be pushing to kernel.org.
--------------------------------------------------
[New Topics]

* bb/merge-marker-crlf (2015-11-24) 1 commit
- merge-file: consider core.crlf when writing merge markers
* bc/object-id (2015-11-20) 12 commits
- remote: convert functions to struct object_id
- Remove get_object_hash.
- Convert struct object to object_id
- Add several uses of get_object_hash.
- object: introduce get_object_hash macro.
- ref_newer: convert to use struct object_id
- push_refs_with_export: convert to struct object_id
- get_remote_heads: convert to struct object_id
- parse_fetch: convert to use struct object_id
- add_sought_entry_mem: convert to struct object_id
- Convert struct ref to use object_id.
- sha1_file: introduce has_object_file helper.

Write out merge markers using system end-of-line convention.
More transition from "unsigned char[40]" to "struct object_id".

Waiting for a re-roll to handle gitattributes.
This needed a few merge fixups, but is mostly disentangled from other
topics.

Will merge to 'next'.


* dt/fsck-verify-pack-error (2015-12-01) 1 commit
- verify_pack: do not ignore return value of verification function

The exit code of git-fsck would not reflect some types of errors found
in packed objects.

Will merge to 'next'.


* kn/ref-filter-atom-parsing (2015-12-01) 10 commits
- ref-filter: introduce objectname_atom_parser()
- ref-filter: introduce contents_atom_parser()
- ref-filter: introduce remote_ref_atom_parser()
- ref-filter: introduce align_atom_parser()
- strbuf: introduce strbuf_split_str_without_term()
- ref-filter: introduce color_atom_parser()
- ref-filter: skip deref specifier in match_atom_name()
- ref-fitler: bump match_atom() name to the top
- ref-filter: introduce struct used_atom
- ref-filter: introduce a parsing function for each atom in valid_atom

Refactoring of ref-filter's format-parsing code, in preparation
for "branch --format" and friends.

This replaces (for now) kn/for-each-ref-remainder, which will be built
on top.

Waiting for review.


* ls/travis-yaml (2015-11-28) 1 commit
- Add Travis CI support

Provides the necessary infrastructure to build topics using the free
Travis CI. Developers forking from this topic (and enabling Travis) can
do their own builds, and we can turn on auto-builds for git/git
(including build-status for pull requests that people open).

I'm inclined to merge this up, as the worst case is that it becomes
dormant cruft in the repository root.

Will merge to 'next'.


* rs/status-detached-head-memcmp (2015-11-28) 1 commit
- wt-status: correct and simplify check for detached HEAD

Fix some string-matching corner cases when digging in the reflog for
"git status".

Will merge to 'next', then 'maint'.


* sg/lock-file-commit-error (2015-12-01) 1 commit
- Make error message after failing commit_lock_file() less confusing

Cosmetic improvement to lock-file error messages.

Comments on the new messages?

Will merge to 'next' after giving time for bikeshedding.


--------------------------------------------------
[Graduated to "master"]

* ar/doc-env-variable-format (2015-11-11) 1 commit
(merged to 'next' on 2015-11-24 at 5ddf33e)
+ Documentation: make environment variable formatting more consistent

Minor documentation fixup.

Will merge to 'master'.


* cb/hook-sigpipe (2015-11-16) 1 commit
(merged to 'next' on 2015-11-24 at 0bf4228)
+ allow hooks to ignore their standard input stream

We now consistently allow all hooks to ignore their standard input,
rather than having git complain of SIGPIPE.

Will merge to 'master'.


* cb/ssl-config-pathnames (2015-11-24) 1 commit
@ -55,15 +144,46 @@ But note that I will _not_ be pushing to kernel.org.
Will merge to 'master'.


* dk/gc-more-wo-pack (2015-11-24) 3 commits
- gc: Clean garbage .bitmap files from pack dir
- t5304: Add test for .bitmap garbage files
- prepare_packed_git(): find more garbage
* dg/subtree-test-cleanup (2015-11-13) 7 commits
(merged to 'next' on 2015-11-24 at 1297941)
+ contrib/subtree: Handle '--prefix' argument with a slash appended
+ contrib/subtree: Make each test self-contained
+ contrib/subtree: Add split tests
+ contrib/subtree: Add merge tests
+ contrib/subtree: Add tests for subtree add
+ contrib/subtree: Add test for missing subtree
+ contrib/subtree: Clean and refactor test code

Follow-on to dk/gc-idx-wo-pack topic, to clean up stale
.bitmap and .keep files.
Test cleanups for the subtree project.

Waiting for review.
Will merge to 'master'.


* dk/check-ignore-docs (2015-11-24) 1 commit
(merged to 'next' on 2015-11-24 at 0cce5c5)
+ check-ignore: correct documentation about output

Documentation clarification for "check-ignore" without "--verbose".

Will merge to 'master'.


* dk/rerere-train-quoting (2015-11-20) 1 commit
(merged to 'next' on 2015-11-24 at f9fa96e)
+ Escape Git's exec path in contrib/rerere-train.sh script

Fix shell quoting in contrib script.

Will merge to 'master'.


* dk/t5813-unc-paths (2015-11-20) 1 commit
(merged to 'next' on 2015-11-24 at 204e4a8)
+ t5813: avoid creating urls that break on cygwin

Test portability fix for a topic in v2.6.1.

Will merge to 'master'.


* dt/http-range (2015-11-11) 1 commit
@ -75,12 +195,80 @@ But note that I will _not_ be pushing to kernel.org.
Will merge to 'master'.


* jk/send-email-ssl-errors (2015-11-24) 1 commit
- send-email: enable SSL level 1 debug output
* eg/p4-submit-catch-failure (2015-11-24) 1 commit
(merged to 'next' on 2015-11-24 at cf2dc76)
+ git-p4: clean up after p4 submit failure

Improve error reporting when SMTP TLS fails.
Just like the working tree is cleaned up when the user cancelled
submission in P4Submit.applyCommit(), clean up the mess if "p4
submit" fails.

Will merge to 'next'.
Will merge to 'master'.


* fm/shell-path-whitespace (2015-11-13) 1 commit
(merged to 'next' on 2015-11-24 at c2b8bdf)
+ rebase-i-exec: Allow space in SHELL_PATH

Portability fix for Windows, which may rewrite $SHELL variable using
non-POSIX paths.

Will merge to 'master'.


* jk/send-email-ca-path (2015-11-24) 1 commit
(merged to 'next' on 2015-11-24 at 923b803)
+ send-email: die if CA path doesn't exist

Use a safer behavior when we hit errors verifying remote certificates.

Will merge to 'master'.


* jk/send-email-expand-paths (2015-11-20) 1 commit
(merged to 'next' on 2015-11-24 at d32fa4d)
+ send-email: expand path in sendemail.smtpsslcertpath config

Expand paths in some send-email config variables.

Will merge to 'master'.


* js/test-modernize-t9300 (2015-11-20) 7 commits
(merged to 'next' on 2015-11-24 at d399494)
+ modernize t9300: move test preparations into test_expect_success
+ modernize t9300: mark here-doc words to ignore tab indentation
+ modernize t9300: use test_when_finished for clean-up
+ modernize t9300: wrap lines after &&
+ modernize t9300: use test_must_be_empty
+ modernize t9300: use test_must_fail
+ modernize t9300: single-quote placement and indentation

Clean up style in an ancient test.

Will merge to 'master'.


* ld/p4-detached-head (2015-11-24) 3 commits
(merged to 'next' on 2015-11-24 at 36ab36a)
+ git-p4: work with a detached head
+ git-p4: add option to system() to return subshell status
+ git-p4: add failing test for submit from detached head

Make git-p4 work on a detached head.

Will merge to 'master'.


* ls/p4-test-timeouts (2015-11-20) 3 commits
(merged to 'next' on 2015-11-24 at 905cff8)
+ git-p4: add trap to kill p4d on test exit
+ git-p4: add p4d timeout in tests
+ git-p4: retry kill/cleanup operations in tests with timeout

Work around some test flakiness with p4d.

Will merge to 'master'.


* mg/doc-word-diff-example (2015-11-24) 1 commit
@ -90,50 +278,32 @@ But note that I will _not_ be pushing to kernel.org.
Will merge to 'master'.


* mr/ff-refs (2015-11-24) 5 commits
- ff-refs: Add tests
- ff-refs: Add documentation
- ff-refs: add --dry-run and --skip-worktree options
- ff-refs: update each updatable ref
- ff-refs: builtin cmd to check and fast forward local refs to their upstream
* mk/blame-first-parent (2015-11-24) 1 commit
(merged to 'next' on 2015-11-24 at a2ee2a4)
+ blame: fix object casting regression

Specialized command to fast-forward refs to match their upstream.
Regression fix for a topic already in master.

I remain skeptical that this is necessary or sufficient. Comments
welcome.

Will hold.
Will merge to 'master'.


* ps/rebase-keep-empty (2015-11-24) 2 commits
- rebase: fix preserving commits with --keep-empty
- rebase: test broken behavior with --keep-empty
* pt/http-socks-proxy (2015-11-20) 1 commit
(merged to 'next' on 2015-11-20 at dc6ae48)
+ remote-http(s): support SOCKS proxies

Keep duplicate commits via rebase --keep-empty.
Add support for talking http/https over socks proxy.

I'm not sure if I agree with this interpretation of the "rebase
--keep-empty" documentation, but I haven't thought too hard about it.
Comments welcome.

Waiting for review.
Will merge to 'master'.


* rm/subtree-unwrap-tags (2015-11-24) 1 commit
- contrib/subtree: unwrap tag refs
* rs/fsck-nul-header (2015-11-20) 2 commits
(merged to 'next' on 2015-11-24 at 093b3d6)
+ fsck: treat a NUL in a tag header as an error
+ t1450: add tests for NUL in headers of commits and tags

Waiting for review from subtree folks.
Fsck did not correctly detect a NUL-truncated header in a tag.


* sg/bash-prompt-dirty-orphan (2015-11-24) 3 commits
(merged to 'next' on 2015-11-24 at ac6eb1c)
+ bash prompt: indicate dirty index even on orphan branches
+ bash prompt: remove a redundant 'git diff' option
+ bash prompt: test dirty index and worktree while on an orphan branch

Produce correct "dirty" marker for shell prompts, even when we
are on an orphan branch.

Will cook in 'next', then merge to 'master'.
Will merge to 'master'.


* sg/filter-branch-dwim-ambiguity (2015-11-24) 1 commit
@ -144,51 +314,6 @@ But note that I will _not_ be pushing to kernel.org.

Will merge to 'master'.


* sg/sh-require-clean-orphan (2015-11-24) 2 commits
- sh-setup: make require_clean_work_tree() work on orphan branches
- Add tests for git-sh-setup's require_clean_work_tree()

Allow users of git-sh-setup to handle orphan branch state.

This series takes the conservative route of requiring scripts to opt
into the looser behavior, at the expense of carrying around a new
option-flag forever. I'm not sure if we need to do so. Comments
welcome.

Will merge to 'next' in a few days.


* tb/ls-files-eol (2015-11-24) 1 commit
- ls-files: Add eol diagnostics

Add options to ls-files to help diagnose end-of-line problems.

This latest round hasn't gotten any review yet.

Waiting for review.

--------------------------------------------------
[Graduated to "master"]



* fp/subtree-todo-update (2015-11-06) 1 commit
(merged to 'next' on 2015-11-20 at 3861698)
+ contrib/subtree: remove "push" command from the "todo" file

Will merge to 'master'.


* rc/configure-use-libs-when-checking-a-lib (2015-11-06) 1 commit
(merged to 'next' on 2015-11-20 at 37c26aa)
+ configure.ac: use $LIBS not $CFLAGS when testing -lpthread

The "configure" script did not test for -lpthread correctly, which
upset some linkers.

Will merge to 'master'.

--------------------------------------------------
[Stalled]

@ -256,76 +381,103 @@ But note that I will _not_ be pushing to kernel.org.
--------------------------------------------------
[Cooking]

* ar/doc-env-variable-format (2015-11-11) 1 commit
(merged to 'next' on 2015-11-24 at 5ddf33e)
+ Documentation: make environment variable formatting more consistent
* bb/merge-marker-crlf (2015-11-24) 1 commit
- merge-file: consider core.crlf when writing merge markers

Minor documentation fixup.
Write out merge markers using system end-of-line convention.

Waiting for a re-roll to handle gitattributes.


* dk/gc-more-wo-pack (2015-11-24) 3 commits
- gc: Clean garbage .bitmap files from pack dir
- t5304: Add test for .bitmap garbage files
- prepare_packed_git(): find more garbage

Follow-on to dk/gc-idx-wo-pack topic, to clean up stale
.bitmap and .keep files.

Waiting for review.


* jk/send-email-ssl-errors (2015-11-24) 1 commit
- send-email: enable SSL level 1 debug output

Improve error reporting when SMTP TLS fails.

Waiting for re-roll.


* mr/ff-refs (2015-11-28) 6 commits
- builtin/ff-refs.c: mark some file-local variables static
- ff-refs: Add tests
- ff-refs: Add documentation
- ff-refs: add --dry-run and --skip-worktree options
- ff-refs: update each updatable ref
- ff-refs: builtin cmd to check and fast forward local refs to their upstream

Specialized command to fast-forward refs to match their upstream.

I remain skeptical that this is necessary or sufficient. Comments
welcome.

Will hold.


* ps/rebase-keep-empty (2015-11-24) 2 commits
- rebase: fix preserving commits with --keep-empty
- rebase: test broken behavior with --keep-empty

Keep duplicate commits via rebase --keep-empty.

I'm not sure if I agree with this interpretation of the "rebase
--keep-empty" documentation, but I haven't thought too hard about it.
Comments welcome.

Waiting for review.


* rm/subtree-unwrap-tags (2015-11-24) 1 commit
- contrib/subtree: unwrap tag refs

Waiting for review from subtree folks.


* sg/bash-prompt-dirty-orphan (2015-11-24) 3 commits
(merged to 'next' on 2015-11-24 at ac6eb1c)
+ bash prompt: indicate dirty index even on orphan branches
+ bash prompt: remove a redundant 'git diff' option
+ bash prompt: test dirty index and worktree while on an orphan branch

Produce correct "dirty" marker for shell prompts, even when we
are on an orphan branch.

Will merge to 'master'.


* ld/p4-detached-head (2015-11-24) 3 commits
(merged to 'next' on 2015-11-24 at 36ab36a)
+ git-p4: work with a detached head
+ git-p4: add option to system() to return subshell status
+ git-p4: add failing test for submit from detached head
* sg/sh-require-clean-orphan (2015-11-24) 2 commits
- sh-setup: make require_clean_work_tree() work on orphan branches
- Add tests for git-sh-setup's require_clean_work_tree()

Make git-p4 work on a detached head.
Allow users of git-sh-setup to handle orphan branch state.

Will merge to 'master'.
This series takes the conservative route of requiring scripts to opt
into the looser behavior, at the expense of carrying around a new
option-flag forever. I'm not sure if we need to do so. Comments
welcome.

Waiting for re-roll?


* cb/hook-sigpipe (2015-11-16) 1 commit
(merged to 'next' on 2015-11-24 at 0bf4228)
+ allow hooks to ignore their standard input stream
* tb/ls-files-eol (2015-11-28) 2 commits
- convert.c: mark a file-local function static
- ls-files: Add eol diagnostics

We now consistently allow all hooks to ignore their standard input,
rather than having git complain of SIGPIPE.
Add options to ls-files to help diagnose end-of-line problems.

Will merge to 'master'.
This latest round hasn't gotten any review yet.


* dg/subtree-test-cleanup (2015-11-13) 7 commits
(merged to 'next' on 2015-11-24 at 1297941)
+ contrib/subtree: Handle '--prefix' argument with a slash appended
+ contrib/subtree: Make each test self-contained
+ contrib/subtree: Add split tests
+ contrib/subtree: Add merge tests
+ contrib/subtree: Add tests for subtree add
+ contrib/subtree: Add test for missing subtree
+ contrib/subtree: Clean and refactor test code

Test cleanups for the subtree project.

Will merge to 'master'.


* dk/check-ignore-docs (2015-11-24) 1 commit
(merged to 'next' on 2015-11-24 at 0cce5c5)
+ check-ignore: correct documentation about output

Documentation clarification for "check-ignore" without "--verbose".

Will merge to 'master'.


* dk/rerere-train-quoting (2015-11-20) 1 commit
(merged to 'next' on 2015-11-24 at f9fa96e)
+ Escape Git's exec path in contrib/rerere-train.sh script

Fix shell quoting in contrib script.

Will merge to 'master'.


* dk/t5813-unc-paths (2015-11-20) 1 commit
(merged to 'next' on 2015-11-24 at 204e4a8)
+ t5813: avoid creating urls that break on cygwin

Test portability fix for a topic in v2.6.1.

Will merge to 'master'.
Waiting for review.


* ec/annotate-deleted (2015-11-20) 1 commit
@ -337,16 +489,6 @@ But note that I will _not_ be pushing to kernel.org.
Needs review.


* fm/shell-path-whitespace (2015-11-13) 1 commit
(merged to 'next' on 2015-11-24 at c2b8bdf)
+ rebase-i-exec: Allow space in SHELL_PATH

Portability fix for Windows, which may rewrite $SHELL variable using
non-POSIX paths.

Will merge to 'master'.


* jk/filter-branch-no-index (2015-11-06) 1 commit
(merged to 'next' on 2015-11-24 at e31946e)
+ filter-branch: skip index read/write when possible
@ -354,15 +496,6 @@ But note that I will _not_ be pushing to kernel.org.
Speed up filter-branch for cases where we only care about rewriting
commits, not tree data.

Will merge to 'master' two cycles from now.


* jk/send-email-ca-path (2015-11-24) 1 commit
(merged to 'next' on 2015-11-24 at 923b803)
+ send-email: die if CA path doesn't exist

Use a safer behavior when we hit errors verifying remote certificates.

Will merge to 'master'.


@ -374,53 +507,18 @@ But note that I will _not_ be pushing to kernel.org.
Teach send-email to dump mail aliases, so that we can do tab completion
on the command line.

Will merge to 'master' two cycles from now.


* jk/send-email-expand-paths (2015-11-20) 1 commit
(merged to 'next' on 2015-11-24 at d32fa4d)
+ send-email: expand path in sendemail.smtpsslcertpath config

Expand paths in some send-email config variables.

Will merge to 'master'.


* js/test-modernize-t9300 (2015-11-20) 7 commits
(merged to 'next' on 2015-11-24 at d399494)
+ modernize t9300: move test preparations into test_expect_success
+ modernize t9300: mark here-doc words to ignore tab indentation
+ modernize t9300: use test_when_finished for clean-up
+ modernize t9300: wrap lines after &&
+ modernize t9300: use test_must_be_empty
+ modernize t9300: use test_must_fail
+ modernize t9300: single-quote placement and indentation

Clean up style in an ancient test.

Will merge to 'master'.


* ls/p4-test-timeouts (2015-11-20) 3 commits
(merged to 'next' on 2015-11-24 at 905cff8)
+ git-p4: add trap to kill p4d on test exit
+ git-p4: add p4d timeout in tests
+ git-p4: retry kill/cleanup operations in tests with timeout

Work around some test flakiness with p4d.

Will merge to 'master'.


* ls/test-must-fail-sigpipe (2015-11-24) 3 commits
- SQUASH???
- add "ok=sigpipe" to test_must_fail and use it to fix flaky tests
- implement test_might_fail using a refactored test_must_fail
* ls/test-must-fail-sigpipe (2015-11-28) 2 commits
(merged to 'next' on 2015-12-01 at d374686)
+ add "ok=sigpipe" to test_must_fail and use it to fix flaky tests
+ implement test_might_fail using a refactored test_must_fail

Fix some racy client/server tests by treating SIGPIPE the same as a
normal non-zero exit.

Will hold pending logic cleanups.
Will merge to 'master' two cycles from now.


* mc/push-recurse-submodules-config (2015-11-20) 1 commit
@ -432,31 +530,12 @@ But note that I will _not_ be pushing to kernel.org.
Waiting for review from submodule folks.


* mk/blame-first-parent (2015-11-24) 1 commit
(merged to 'next' on 2015-11-24 at a2ee2a4)
+ blame: fix object casting regression

Regression fix for a topic already in master.

Will merge to 'master'.


* np/credential-cache-sighup (2015-11-20) 1 commit
(merged to 'next' on 2015-11-24 at 410167f)
+ credential-cache: new option to ignore sighup

Workaround for using credential-cache with emacs.

Will merge to 'master' two cycles from now.


* rs/fsck-nul-header (2015-11-20) 2 commits
(merged to 'next' on 2015-11-24 at 093b3d6)
+ fsck: treat a NUL in a tag header as an error
+ t1450: add tests for NUL in headers of commits and tags

Fsck did not correctly detect a NUL-truncated header in a tag.

Will merge to 'master'.


@ -470,7 +549,7 @@ But note that I will _not_ be pushing to kernel.org.

Make "-h" command line option work more consistently in all commands.

Needs review.
Will merge to 'master'.


* dt/refs-backend-pre-vtable (2015-11-20) 10 commits
@ -488,18 +567,19 @@ But note that I will _not_ be pushing to kernel.org.

Code preparation for pluggable ref backends.

Will cook in 'next'.
Will merge to 'master' two cycles from now.


* ad/sha1-update-chunked (2015-11-05) 2 commits
- sha1: allow limiting the size of the data passed to SHA1_Update()
- sha1: provide another level of indirection for the SHA-1 functions
(merged to 'next' on 2015-12-01 at a22bf47)
+ sha1: allow limiting the size of the data passed to SHA1_Update()
+ sha1: provide another level of indirection for the SHA-1 functions

Apple's common crypto implementation of SHA1_Update() does not take
more than 4GB at a time, and we now have a compile-time workaround
for it.

Will merge to 'next'.
Will merge to 'master'.


* vl/grep-configurable-threads (2015-11-01) 1 commit
@ -508,9 +588,9 @@ But note that I will _not_ be pushing to kernel.org.
"git grep" can now be configured (or told from the command line)
how many threads to use when searching in the working tree files.

I haven't reviewed v6 yet. More eyes are welcome.
There was some review from Eric.

Needs review.
Waiting for re-roll?


* kf/http-proxy-auth-methods (2015-11-04) 3 commits
@ -526,7 +606,8 @@ But note that I will _not_ be pushing to kernel.org.
material in user's keyrings.

I ejected this from pu for the moment, as it conflicts with the
pt/http-socks-proxy topic.
pt/http-socks-proxy topic. That is now in master, so it can
be re-rolled on top.

Still being worked on.
($gmane/280925).
@ -608,35 +689,15 @@ But note that I will _not_ be pushing to kernel.org.
Waiting for reviews.


* eg/p4-submit-catch-failure (2015-11-24) 1 commit
(merged to 'next' on 2015-11-24 at cf2dc76)
+ git-p4: clean up after p4 submit failure

Just like the working tree is cleaned up when the user cancelled
submission in P4Submit.applyCommit(), clean up the mess if "p4
submit" fails.

Will merge to 'master'.


* ep/ident-with-getaddrinfo (2015-10-30) 1 commit
- (NEEDSWORK $gmane/280507) ident.c: add support for IPv6
* ep/ident-with-getaddrinfo (2015-11-28) 1 commit
(merged to 'next' on 2015-12-01 at 0775d4c)
+ ident.c: add support for IPv6

A build without NO_IPv6 used to use gethostbyname() when guessing
user's hostname, instead of getaddrinfo() that is used in other
codepaths in such a build.

Waiting for a reroll.
($gmane/280507)


* pt/http-socks-proxy (2015-11-20) 1 commit
(merged to 'next' on 2015-11-20 at dc6ae48)
+ remote-http(s): support SOCKS proxies

Add support for talking http/https over socks proxy.

Will merge to 'master'.
Will merge to 'master' two cycles from now.


* mh/notes-allow-reading-treeish (2015-10-08) 3 commits
@ -711,18 +772,21 @@ But note that I will _not_ be pushing to kernel.org.


* kn/for-each-branch-remainder (2015-10-02) 9 commits
- branch: implement '--format' option
- branch: use ref-filter printing APIs
- ref-filter: make %(upstream:track) prints "[gone]" for invalid upstreams
- ref-filter: introduce format_ref_array_item()
- ref-filter: adopt get_head_description() from branch.c
- ref-filter: modify "%(objectname:short)" to take length
- ref-filter: add support for %(path) atom
- ref-filter: implement %(if:equals=<string>) and %(if:notequals=<string>)
- ref-filter: implement %(if), %(then), and %(else) atoms
. branch: implement '--format' option
. branch: use ref-filter printing APIs
. ref-filter: make %(upstream:track) prints "[gone]" for invalid upstreams
. ref-filter: introduce format_ref_array_item()
. ref-filter: adopt get_head_description() from branch.c
. ref-filter: modify "%(objectname:short)" to take length
. ref-filter: add support for %(path) atom
. ref-filter: implement %(if:equals=<string>) and %(if:notequals=<string>)
. ref-filter: implement %(if), %(then), and %(else) atoms

More unification among "branch -l", "tag -l" and "for-each-ref --format".

Ejected from pu for now, as a re-roll should come on top of
kn/ref-filter-atom-parsing.

Expecting a reroll.
($gmane/278926)

@ -747,7 +811,7 @@ But note that I will _not_ be pushing to kernel.org.


* sb/submodule-parallel-fetch (2015-11-24) 17 commits
. run-command: detect finished children by closed pipe rather than waitpid
- run-command: detect finished children by closed pipe rather than waitpid
(merged to 'next' on 2015-11-20 at 89fc723)
+ strbuf: update documentation for strbuf_read_once()
+ run-command: remove set_nonblocking()
@ -772,9 +836,7 @@ But note that I will _not_ be pushing to kernel.org.
Add a framework to spawn a group of processes in parallel, and use
it to run "git fetch --recurse-submodules" in parallel.

Is everybody happy with the topic commit?

Will cook in 'next'.
Will merge top commit to 'next'.


* ad/cygwin-wants-rename (2015-08-07) 1 commit