{"thread":{"id":"40841","subject":"What's cooking in git.git (Nov 2015, #03; Fri, 20)","startedAt":"2015-11-20T14:09:37Z","lastAt":"2015-11-24T22:06:26Z","messageCount":12,"participants":["Jeff King","Karthik Nayak","Luke Diamand","Johannes Schindelin","Victor Leschuk","Michael J Gruber","Max Kirillov"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"273545","messageId":"20151120140937.GA17079@sigill.intra.peff.net","threadId":"40841","inReplyTo":null,"subject":"What's cooking in git.git (Nov 2015, #03; Fri, 20)","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2015-11-20T14:09:37Z","receivedAt":"2015-11-20T14:09:37Z","isPatch":false,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"What's cooking in git.git (Nov 2015, #03; Fri, 20)\n--------------------------------------------------\n\nHere are the topics that have been cooking.  Commits prefixed with\n'-' are only in 'pu' (proposed updates) while commits prefixed with\n'+' are in 'next'.\n\nSorry for the extreme delay in pushing out my tree. I ended up busier\nthan I expected during the first week of Junio's absence, and then it\ntook me a while to dig myself out of the ever-filling hole of incoming\ntopics. :)\n\nExpect quite a few new topics in this edition.  A number of them have\nseen review already, and I'm planning to merge them to \"next\" fairly\nquickly (I may do another integration cycle late tonight or tomorrow\nwith those changes).\n\nI still have a few threads to comb through on the list. If you don't see\nthe latest version of your topic here, please feel free to ping me, or\nto repost.\n\nYou can find the normal integration branches at:\n\n    https://github.com/git/git/\n\nand all topic branches at:\n\n    https://github.com/peff/git/\n\nBut note that I will _not_ be pushing to kernel.org.\n\n\n--------------------------------------------------\n[New Topics]\n\n* ap/doc-env-variable-format (2015-11-11) 1 commit\n - Documentation: make environment variable formatting more consistent\n\n Minor documentation fixup.\n\n Will merge to 'next'.\n\n\n* cb/hook-sigpipe (2015-11-16) 1 commit\n - allow hooks to ignore their standard input stream\n\n We now consistently allow all hooks to ignore their standard input,\n rather than having git complain of SIGPIPE.\n\n Will merge to 'next'.\n\n\n* dg/subtree-test-cleanup (2015-11-13) 7 commits\n - contrib/subtree: Handle '--prefix' argument with a slash appended\n - contrib/subtree: Make each test self-contained\n - contrib/subtree: Add split tests\n - contrib/subtree: Add merge tests\n - contrib/subtree: Add tests for subtree add\n - contrib/subtree: Add test for missing subtree\n - contrib/subtree: Clean and refactor test code\n\n Test cleanups for the subtree project.\n\n Will merge to 'next'.\n\n\n* dk/check-ignore-docs (2015-11-20) 1 commit\n - check-ignore: correct documentation about output\n\n Documentation clarification for \"check-ignore\" without \"--verbose\".\n\n This may be losing information, and we would want to enhance the\n \"--verbose\" documentation.\n\n Will hold for comments.\n\n\n* dk/rerere-train-quoting (2015-11-20) 1 commit\n - Escape Git's exec path in contrib/rerere-train.sh script\n\n Fix shell quoting in contrib script.\n\n Will merge to 'next'.\n\n\n* dk/t5813-unc-paths (2015-11-20) 1 commit\n - t5813: avoid creating urls that break on cygwin\n\n Test portability fix for a topic in v2.6.1.\n\n Will merge to 'next'.\n\n\n* ec/annotate-deleted (2015-11-20) 1 commit\n - annotate: skip checking working tree if a revision is provided\n\n Usability fix for annotate-specific \"<file> <rev>\" syntax with deleted\n files.\n\n Needs review.\n\n\n* fm/shell-path-whitespace (2015-11-13) 1 commit\n - rebase-i-exec: Allow space in SHELL_PATH\n\n Portability fix for Windows, which may rewrite $SHELL variable using\n non-POSIX paths.\n\n Will merge to 'next'.\n\n\n* jk/filter-branch-no-index (2015-11-06) 1 commit\n - filter-branch: skip index read/write when possible\n\n Speed up filter-branch for cases where we only care about rewriting\n commits, not tree data.\n\n Needs review.\n\n\n* jk/send-email-ca-path (2015-11-20) 1 commit\n - send-email: die if CA path doesn't exist\n\n Use a safer behavior when we hit errors verifying remote certificates.\n\n We may want to update this to guide users toward workarounds.\n\n\n* jk/send-email-complete-aliases (2015-11-20) 2 commits\n - completion: add support for completing email aliases\n - sendemail: teach git-send-email to dump alias names\n\n Teach send-email to dump mail aliases, so that we can do tab completion\n on the command line.\n\n This is v4. Is everybody happy with this one?\n\n\n* jk/send-email-expand-paths (2015-11-20) 2 commits\n - send-email: expand paths in sendemail.{to,cc}cmd config\n - send-email: expand path in sendemail.smtpsslcertpath config\n\n Expand paths in some send-email config variables.\n\n Needs review.\n\n\n* js/test-modernize-t9300 (2015-11-20) 7 commits\n - modernize t9300: move test preparations into test_expect_success\n - modernize t9300: mark here-doc words to ignore tab indentation\n - modernize t9300: use test_when_finished for clean-up\n - modernize t9300: wrap lines after &&\n - modernize t9300: use test_must_be_empty\n - modernize t9300: use test_must_fail\n - modernize t9300: single-quote placement and indentation\n\n Clean up style in an ancient test.\n\n Will merge to 'next'.\n\n\n* ls/p4-test-timeouts (2015-11-20) 3 commits\n - git-p4: add trap to kill p4d on test exit\n - git-p4: add p4d timeout in tests\n - git-p4: retry kill/cleanup operations in tests with timeout\n\n Work around some test flakiness with p4d.\n\n Will merge to 'next'.\n\n\n* ls/test-must-fail-sigpipe (2015-11-20) 2 commits\n - add \"ok=sigpipe\" to test_must_fail and use it to fix flaky tests\n - implement test_might_fail using a refactored test_must_fail\n\n Fix some racy client/server tests by treating SIGPIPE the same as a\n normal non-zero exit.\n\n Will merge to 'next'.\n\n\n* mc/push-recurse-submodules-config (2015-11-20) 1 commit\n - push: add recurseSubmodules config option\n\n Add new config to avoid typing \"--recurse-submodules\" on each push.\n\n People seemed to like v1, but v2 didn't see a lot of review. Is\n everybody happy?\n\n\n* mk/blame-first-parent (2015-11-20) 1 commit\n - blame: fix object casting regression\n\n Regression fix for a topic already in master.\n\n Will merge to 'next'.\n\n\n* np/credential-cache-sighup (2015-11-20) 1 commit\n - credential-cache: new option to ignore sighup\n\n Workaround for using credential-cache with emacs.\n\n Will merge to 'next'.\n\n\n* rs/fsck-nul-header (2015-11-20) 2 commits\n - fsck: treat a NUL in a tag header as an error\n - t1450: add tests for NUL in headers of commits and tags\n\n Fsck did not correctly detect a NUL-truncated header in a tag.\n\n Will merge to 'next'.\n\n\n* rs/parseopt-short-help (2015-11-20) 5 commits\n - show-ref: stop using PARSE_OPT_NO_INTERNAL_HELP\n - grep: stop using PARSE_OPT_NO_INTERNAL_HELP\n - parse-options: allow -h as a short option\n - parse-options: inline parse_options_usage() at its only remaining caller\n - parse-options: deduplicate parse_options_usage() calls\n\n Make \"-h\" command line option work more consistently in all commands.\n\n Needs review.\n\n\n--------------------------------------------------\n[Graduated to \"master\"]\n\n* dg/git-svn-empty-dirs (2015-11-05) 1 commit\n - git-svn: improve rebase/mkdirs performance\n\n This came via a pull from Eric's git-svn tree, and I dropped the\n topic branch that Junio had created.\n\n\n* dk/gc-idx-wo-pack (2015-11-04) 3 commits\n  (merged to 'next' on 2015-11-05 at af058fa)\n + gc: remove garbage .idx files from pack dir\n + t5304: test cleaning pack garbage\n + prepare_packed_git(): refactor garbage reporting in pack directory\n\n Having a leftover .idx file without corresponding .pack file in\n the repository hurts performance; \"git gc\" learned to prune them.\n\n We may want to do the same for .bitmap (and notice but not prune\n .keep) without corresponding .pack, but that can be a separate\n topic.\n\n\n* lf/ref-is-hidden-namespace (2015-11-05) 4 commits\n  (merged to 'next' on 2015-11-05 at b245404)\n + t5509: add basic tests for hideRefs\n + hideRefs: add support for matching full refs\n + upload-pack: strip refs before calling ref_is_hidden()\n + config.txt: document the semantics of hideRefs with namespaces\n\n Extend transfer.hideRefs to work better with use of namespaces.\n\n\n--------------------------------------------------\n[Stalled]\n\n* nd/ita-cleanup (2015-09-06) 6 commits\n - grep: make it clear i-t-a entries are ignored\n - checkout(-index): do not checkout i-t-a entries\n - apply: make sure check_preimage() does not leave empty file on error\n - apply: fix adding new files on i-t-a entries\n - add and use a convenience macro ce_intent_to_add()\n - blame: remove obsolete comment\n\n Paths that have been told the index about with \"add -N\" are not yet\n in the index, but various commands behaved as if they already are.\n\n Some commits need better explanation.\n\n Waiting for a reroll.\n\n\n* ld/p4-detached-head (2015-09-09) 2 commits\n - git-p4: work with a detached head\n - git-p4: add failing test for submit from detached head\n\n Will be rerolled.\n ($gmane/277574)\n\n\n* mg/httpd-tests-update-for-apache-2.4 (2015-04-08) 2 commits\n - t/lib-git-svn: check same httpd module dirs as lib-httpd\n - t/lib-httpd: load mod_unixd\n\n This is the first two commits in a three-patch series $gmane/266962\n\n Becoming tired of waiting for a reroll.\n with updated log message ($gmane/268061).\n\n\n* wp/sha1-name-negative-match (2015-06-08) 2 commits\n - sha1_name.c: introduce '^{/!-<negative pattern>}' notation\n - test for '!' handling in rev-parse's named commits\n\n Introduce \"branch^{/!-<pattern>}\" notation to name a commit\n reachable from branch that does not match the given pattern.\n\n Becoming tired of waiting for a reroll.\n ($gmane/271213).\n\n\n* ak/format-patch-odir-config (2015-06-19) 1 commit\n - format-patch: introduce format.outputDirectory configuration\n\n Reroll exists but didn't pick it up as it seemed to be still\n collecting review comments.\n\n Becoming tired of waiting for a reroll.\n ($gmane/272180).\n\n\n* jc/diff-b-m (2015-02-23) 5 commits\n . WIPWIP\n . WIP: diff-b-m\n - diffcore-rename: allow easier debugging\n - diffcore-rename.c: add locate_rename_src()\n - diffcore-break: allow debugging\n\n \"git diff -B -M\" produced incorrect patch when the postimage of a\n completely rewritten file is similar to the preimage of a removed\n file; such a resulting file must not be expressed as a rename from\n other place.\n\n The fix in this patch is broken, unfortunately.\n\n--------------------------------------------------\n[Cooking]\n\n* dt/refs-backend-pre-vtable (2015-11-20) 10 commits\n - refs: break out ref conflict checks\n - files_log_ref_write: new function\n - initdb: make safe_create_dir public\n - refs: split filesystem-based refs code into a new file\n - refs/refs-internal.h: new header file\n - refname_is_safe(): improve docstring\n - pack_if_possible_fn(): use ref_type() instead of is_per_worktree_ref()\n - copy_msg(): rename to copy_reflog_msg()\n - verify_refname_available(): new function\n - verify_refname_available(): rename function\n\n Code preparation for pluggable ref backends.\n\n This is the slimmed-down version from Michael, v8. It applies a lot\n more pleasantly than the old one.\n\n Will merge to 'next'.\n\n\n* rc/configure-use-libs-when-checking-a-lib (2015-11-06) 1 commit\n  (merged to 'next' on 2015-11-20 at 37c26aa)\n + configure.ac: use $LIBS not $CFLAGS when testing -lpthread\n\n The \"configure\" script did not test for -lpthread correctly, which\n upset some linkers.\n\n Will merge to 'master'.\n\n\n* ad/sha1-update-chunked (2015-11-05) 2 commits\n - sha1: allow limiting the size of the data passed to SHA1_Update()\n - sha1: provide another level of indirection for the SHA-1 functions\n\n Apple's common crypto implementation of SHA1_Update() does not take\n more than 4GB at a time, and we now have a compile-time workaround\n for it.\n\n Will merge to 'next'.\n\n\n* vl/grep-configurable-threads (2015-11-01) 1 commit\n - grep: add --threads=<num> option and grep.threads configuration\n\n \"git grep\" can now be configured (or told from the command line)\n how many threads to use when searching in the working tree files.\n\n I haven't reviewed v6 yet. More eyes are welcome.\n\n\n* kf/http-proxy-auth-methods (2015-11-04) 3 commits\n . SQUASH???\n . http: use credential API to handle proxy authentication\n . http: allow selection of proxy authentication method\n\n New http.proxyAuthMethod configuration variable can be used to\n specify what authentication method to use, as a way to work around\n proxies that do not give error response expected by libcurl when\n CURLAUTH_ANY is used.  Also, the codepath for proxy authentication\n has been taught to use credential API to store the authentication\n material in user's keyrings.\n\n I ejected this from pu for the moment, as it conflicts with the\n pt/http-socks-proxy topic.\n\n Still being worked on.\n ($gmane/280925).\n\n\n* fp/subtree-todo-update (2015-11-06) 1 commit\n  (merged to 'next' on 2015-11-20 at 3861698)\n + contrib/subtree: remove \"push\" command from the \"todo\" file\n\n Will merge to 'master'.\n\n\n* sb/submodule-parallel-update (2015-11-20) 11 commits\n - clone: allow an explicit argument for parallel submodule clones\n - submodule update: expose parallelism to the user\n - git submodule update: have a dedicated helper for cloning\n - fetching submodules: respect `submodule.jobs` config option\n - submodule-config: introduce parse_generic_submodule_config\n - submodule-config: remove name_and_item_from_var\n - submodule-config: drop check against NULL\n - submodule-config: keep update strategy around\n - run_processes_parallel: delimit intermixed task output\n - Merge branch 'rs/daemon-plug-child-leak' into sb/submodule-parallel-update\n - Merge branch 'sb/submodule-parallel-fetch' into sb/submodule-parallel-update\n (this branch uses sb/submodule-parallel-fetch.)\n\n Builds on top of the \"fetch --recurse-submodules\" work to introduce\n parallel downloading into multiple submodules for \"submodule update\".\n\n Waiting for sb/submodule-parallel-fetch to stabilize.\n\n It would be the cleanest to rebuild sb/submodule-parallel-fetch on\n top of 2.7.0 once it ships and then build this directly on top;\n that way, we do not have to have merges in this topic that\n distracting (besides, some part of the other topic can be updated\n in-place instead of this follow-up topic tweaking them as past\n mistakes and inflexibilities).\n\n I picked up v4 from the list, but it needs review.\n\n\n* jc/strbuf-gets (2015-10-28) 17 commits\n - test-sha1-array: read command stream with strbuf_gets()\n - grep: read -f file with strbuf_gets()\n - send-pack: read list of refs with strbuf_gets()\n - column: read lines with strbuf_gets()\n - cat-file: read batch stream with strbuf_gets()\n - transport-helper: read helper response with strbuf_gets()\n - clone/sha1_file: read info/alternates with strbuf_gets()\n - remote.c: read $GIT_DIR/remotes/* with strbuf_gets()\n - ident.c: read /etc/mailname with strbuf_gets()\n - rev-parse: read parseopt spec with strbuf_gets()\n - revision: read --stdin with strbuf_gets()\n - hash-object: read --stdin-paths with strbuf_gets()\n - mktree: read textual tree representation with strbuf_gets()\n - update-index: read list of paths with strbuf_gets() under --stdin\n - update-index: read --index-info with strbuf_gets()\n - check-attr, check-ignore, checkout-index: read paths with strbuf_gets()\n - strbuf: add strbuf_gets()\n\n Teach codepaths that communicate with users by reading text files\n to be more lenient to editors that write CRLF-terminated lines.\n Note that this is only about communication with Git, like feeding\n list of object names from the standard input instead of from the\n command line, and does not involve files in the working tree.\n\n Waiting for reviews.\n\n\n* eg/p4-submit-catch-failure (2015-10-30) 1 commit\n - git-p4: clean up after p4 submit failure\n\n Just like the working tree is cleaned up when the user cancelled\n submission in P4Submit.applyCommit(), clean up the mess if \"p4\n submit\" fails.\n\n Needs an update to test.\n ($gmane/280539)\n\n\n* ep/ident-with-getaddrinfo (2015-10-30) 1 commit\n - (NEEDSWORK $gmane/280507) ident.c: add support for IPv6\n\n A build without NO_IPv6 used to use gethostbyname() when guessing\n user's hostname, instead of getaddrinfo() that is used in other\n codepaths in such a build.\n\n Waiting for a reroll.\n ($gmane/280507)\n\n\n* jc/test-must-fail-with-sigpipe (2015-10-30) 1 commit\n . test: accept death by SIGPIPE as a valid failure mode\n\n Discarded in favor of ls/test-must-fail-sigpipe.\n\n* pt/http-socks-proxy (2015-11-20) 1 commit\n  (merged to 'next' on 2015-11-20 at dc6ae48)\n + remote-http(s): support SOCKS proxies\n\n Add support for talking http/https over socks proxy.\n\n Will cook in 'next'.\n\n\n* mh/notes-allow-reading-treeish (2015-10-08) 3 commits\n  (merged to 'next' on 2015-10-23 at 8a697f0)\n + notes: allow treeish expressions as notes ref\n + Merge branch 'jk/notes-dwim-doc' into next\n + Merge branch 'jc/merge-drop-old-syntax' into next\n (this branch uses jc/merge-drop-old-syntax.)\n\n Some \"git notes\" operations, e.g. \"git log --notes=<note>\", should\n be able to read notes from any tree-ish that is shaped like a notes\n tree, but the notes infrastructure required that the argument must\n be a ref under refs/notes/.  Loosen it to require a valid ref only\n when the operation would update the notes (in which case we must\n have a place to store the updated notes tree, iow, a ref).\n\n As the patch was done on top of the 'drop old-syntax from merge',\n this has to wait until that other topic can graduate, unfortunately.\n It can be redone in a way that does not depend on that topic after\n this cycle, though.\n\n Will keep in 'next'.\n\n\n* jc/mailinfo (2015-10-21) 1 commit\n - mailinfo: ignore in-body header that we do not care about\n\n Some people write arbitrary garbage at the beginning of a piece of\n e-mail (or after -- >8 -- scissors -- >8 -- line) in the commit log\n message and expect them to be discarded, even though \"From:\" and\n \"Subject:\" are the only documented in-body headers that you are\n supposed to have there.  Allow some garbage (specifically, what may\n look like RFC2822 headers like \"MIME-Version: ...\") to be there and\n ignore them.\n\n I have a feeling that that this is a step in a wrong direction.\n Comments?\n\n\n* js/am-3-merge-recursive-direct (2015-10-12) 2 commits\n  (merged to 'next' on 2015-10-23 at dc631e5)\n + am: make a direct call to merge_recursive\n + merge_recursive_options: introduce the \"gently\" flag\n\n The merge_recursive_generic() function has been made a bit safer to\n call from inside a process.  \"git am -3\" was taught to make a direct\n call to the function when falling back to three-way merge.\n\n Being able to make a direct call would be good in general, but as a\n performance thing, we would want to see it backed up by numbers.\n\n I haven't gone through the \"gently\" change with fine toothed comb;\n I can see that the change avoids calling die(), but I haven't made\n sure that the program states (e.g. what's in the in-core index) are\n adjusted sensibly when it returns to the caller instead of dying,\n or the codepaths that used to die() are free of resource leaks.\n The original code certainly did not care the program states at the\n point of dying exactly because it knew it is going to exit, but now\n they have to care, and they need to be audited.\n\n Will keep in 'next'.\n\n\n* sg/pretty-more-date-mode-format (2015-10-07) 1 commit\n - pretty: add format specifiers for short and raw date formats\n\n Introduce \"%as\" and \"%aR\" placeholders for \"log --format\" to show\n the author date in the short and raw formats.\n\n I have a feeling that that this is a step in a wrong direction.\n Comments?\n\n\n* kn/for-each-branch-remainder (2015-10-02) 9 commits\n - branch: implement '--format' option\n - branch: use ref-filter printing APIs\n - ref-filter: make %(upstream:track) prints \"[gone]\" for invalid upstreams\n - ref-filter: introduce format_ref_array_item()\n - ref-filter: adopt get_head_description() from branch.c\n - ref-filter: modify \"%(objectname:short)\" to take length\n - ref-filter: add support for %(path) atom\n - ref-filter: implement %(if:equals=<string>) and %(if:notequals=<string>)\n - ref-filter: implement %(if), %(then), and %(else) atoms\n\n More unification among \"branch -l\", \"tag -l\" and \"for-each-ref --format\".\n\n Expecting a reroll.\n ($gmane/278926)\n\n\n* jk/graph-format-padding (2015-09-14) 1 commit\n - pretty: pass graph width to pretty formatting for use in '%>|(N)'\n\n Redefine the way '%>|(N)' padding and the \"--graph\" option\n interacts.  It has been that the available columns to display the\n log message was measured from the edge of the area the graph ended,\n but with this it becomes the beginning of the entire output.\n\n I have a suspicion that 50% of the users would appreciate this\n change, and the remainder see this break their expectation.  If\n that is the case, we might need to introduce a similar but\n different alignment operator so that this new behaviour is\n available to those who want to use it, without negatively affecting\n existing uses.\n\n Undecided.\n ($gmane/278326)\n\n\n* sb/submodule-parallel-fetch (2015-11-05) 16 commits\n  (merged to 'next' on 2015-11-20 at 89fc723)\n + strbuf: update documentation for strbuf_read_once()\n + run-command: remove set_nonblocking()\n  (merged to 'next' on 2015-10-23 at 8f04bbd)\n + run-command: fix missing output from late callbacks\n + test-run-command: increase test coverage\n + test-run-command: test for gracefully aborting\n + run-command: initialize the shutdown flag\n + run-command: clear leftover state from child_process structure\n + run-command: fix early shutdown\n  (merged to 'next' on 2015-10-15 at df63590)\n + submodules: allow parallel fetching, add tests and documentation\n + fetch_populated_submodules: use new parallel job processing\n + run-command: add an asynchronous parallel child processor\n + sigchain: add command to pop all common signals\n + strbuf: add strbuf_read_once to read without blocking\n + xread_nonblock: add functionality to read from fds without blocking\n + xread: poll on non blocking fds\n + submodule.c: write \"Fetching submodule <foo>\" to stderr\n (this branch is used by sb/submodule-parallel-update.)\n\n Add a framework to spawn a group of processes in parallel, and use\n it to run \"git fetch --recurse-submodules\" in parallel.\n\n I merged the removal of the non-blocking descriptors to 'next'.\n\n Will cook in 'next'.\n\n\n* ad/cygwin-wants-rename (2015-08-07) 1 commit\n - config.mak.uname: Cygwin needs OBJECT_CREATION_USES_RENAMES\n\n Will hold.\n ($gmane/275680).\n\n\n* jc/rerere-multi (2015-09-14) 7 commits\n - rerere: do use multiple variants\n - t4200: rerere a merge with two identical conflicts\n - rerere: allow multiple variants to exist\n - rerere: delay the recording of preimage\n - rerere: handle leftover rr-cache/$ID directory and postimage files\n - rerere: scan $GIT_DIR/rr-cache/$ID when instantiating a rerere_id\n - rerere: split conflict ID further\n\n \"git rerere\" can encounter two or more files with the same conflict\n signature that have to be resolved in different ways, but there was\n no way to record these separate resolutions.\n\n\n* jc/merge-drop-old-syntax (2015-04-29) 1 commit\n  (merged to 'next' on 2015-10-07 at 50fed71)\n + merge: drop 'git merge <message> HEAD <commit>' syntax\n (this branch is used by mh/notes-allow-reading-treeish.)\n\n Originally merged to 'next' on 2015-05-28\n\n Stop supporting \"git merge <message> HEAD <commit>\" syntax that has\n been deprecated since October 2007.  It has been reported that\n git-gui still uses the deprecated syntax, which needs to be fixed\n before this final step can proceed.\n\n Will keep in 'next'.\n"},{"id":"273590","messageId":"CAOLa=ZRpvd-Nd9HiZMt6aZF9bi5i1MHNDZUSdUsGC9C-t+2bSg@mail.gmail.com","threadId":"40841","inReplyTo":"20151120140937.GA17079@sigill.intra.peff.net","subject":"Re: What's cooking in git.git (Nov 2015, #03; Fri, 20)","fromName":"Karthik Nayak","fromEmail":"karthik.188@gmail.com","sentAt":"2015-11-22T18:32:35Z","receivedAt":"2015-11-22T18:32:35Z","isPatch":false,"sender":{"key":"karthik.188@gmail.com","avatar":"https://avatars.githubusercontent.com/u/1786334?v=4"},"body":">\n> * kn/for-each-branch-remainder (2015-10-02) 9 commits\n>  - branch: implement '--format' option\n>  - branch: use ref-filter printing APIs\n>  - ref-filter: make %(upstream:track) prints \"[gone]\" for invalid upstreams\n>  - ref-filter: introduce format_ref_array_item()\n>  - ref-filter: adopt get_head_description() from branch.c\n>  - ref-filter: modify \"%(objectname:short)\" to take length\n>  - ref-filter: add support for %(path) atom\n>  - ref-filter: implement %(if:equals=<string>) and %(if:notequals=<string>)\n>  - ref-filter: implement %(if), %(then), and %(else) atoms\n>\n>  More unification among \"branch -l\", \"tag -l\" and \"for-each-ref --format\".\n>\n>  Expecting a reroll.\n>  ($gmane/278926)\n>\n\nThis series is supposed to follow this:\nhttp://thread.gmane.org/gmane.comp.version-control.git/281180 which I\nrecently sent.\nSo replace \"for-each-branch-remainder\" with this in \"Whats cooking\"?\n\n-- \nRegards,\nKarthik Nayak\n"},{"id":"273600","messageId":"5652D718.9070201@diamand.org","threadId":"40841","inReplyTo":"20151120140937.GA17079@sigill.intra.peff.net","subject":"Re: What's cooking in git.git (Nov 2015, #03; Fri, 20)","fromName":"Luke Diamand","fromEmail":"luke@diamand.org","sentAt":"2015-11-23T09:06:32Z","receivedAt":"2015-11-23T09:06:32Z","isPatch":false,"sender":{"key":"luke@diamand.org","avatar":"https://avatars.githubusercontent.com/u/5330967?v=4"},"body":"On 20/11/15 14:09, Jeff King wrote:\n> What's cooking in git.git (Nov 2015, #03; Fri, 20)\n> --------------------------------------------------\n>\n> Here are the topics that have been cooking.  Commits prefixed with\n> '-' are only in 'pu' (proposed updates) while commits prefixed with\n> '+' are in 'next'.\n>\n\n<snip>\n\n>\n>   Some commits need better explanation.\n>\n>   Waiting for a reroll.\n>\n>\n> * ld/p4-detached-head (2015-09-09) 2 commits\n>   - git-p4: work with a detached head\n>   - git-p4: add failing test for submit from detached head\n\nRerolled on the 21st.\n\nThanks\nLuke\n"},{"id":"273607","messageId":"alpine.DEB.1.00.1511231407380.1686@s15462909.onlinehome-server.info","threadId":"40841","inReplyTo":"20151120140937.GA17079@sigill.intra.peff.net","subject":"Re: What's cooking in git.git (Nov 2015, #03; Fri, 20)","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2015-11-23T13:09:42Z","receivedAt":"2015-11-23T13:09:42Z","isPatch":false,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi Peff,\n\nOn Fri, 20 Nov 2015, Jeff King wrote:\n\n> * pt/http-socks-proxy (2015-11-20) 1 commit\n>   (merged to 'next' on 2015-11-20 at dc6ae48)\n>  + remote-http(s): support SOCKS proxies\n> \n>  Add support for talking http/https over socks proxy.\n> \n>  Will cook in 'next'.\n\nWith all due respect, I do not thing this needs more cooking, as it\n\n1. was tested extensively by yours truly in the Git for Windows context,\n   and it\n\n2. cannot possibly break anything because it tests specifically for the\n   \"socks:\" prefix. It is a pure new feature.\n\nCiao,\nJohannes\n"},{"id":"273608","messageId":"56531BE3.80803@gmail.com","threadId":"40841","inReplyTo":"20151120140937.GA17079@sigill.intra.peff.net","subject":"Re: What's cooking in git.git (Nov 2015, #03; Fri, 20)","fromName":"Victor Leschuk","fromEmail":"vleschuk@gmail.com","sentAt":"2015-11-23T14:00:03Z","receivedAt":"2015-11-23T14:00:03Z","isPatch":false,"sender":{"key":"vleschuk@gmail.com","avatar":"https://avatars.githubusercontent.com/u/1045374?v=4"},"body":"\nOn 11/20/2015 05:09 PM, Jeff King wrote:\n> * vl/grep-configurable-threads (2015-11-01) 1 commit\n>   - grep: add --threads=<num> option and grep.threads configuration\n>\n>   \"git grep\" can now be configured (or told from the command line)\n>   how many threads to use when searching in the working tree files.\n>\n>   I haven't reviewed v6 yet. More eyes are welcome.\nActually v6 includes only changes to special meaning of \"0\" (0 is now \ndefault behavior - 8 threads), little corrections to documentation and \ngetting rid of online_cpus() in decision-tree. All as discussed in \ncomments for v4/5.\n\n--\nVictor\n"},{"id":"273613","messageId":"20151123185718.GB2597@sigill.intra.peff.net","threadId":"40841","inReplyTo":"alpine.DEB.1.00.1511231407380.1686@s15462909.onlinehome-server.info","subject":"Re: What's cooking in git.git (Nov 2015, #03; Fri, 20)","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2015-11-23T18:57:19Z","receivedAt":"2015-11-23T18:57:19Z","isPatch":false,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Mon, Nov 23, 2015 at 02:09:42PM +0100, Johannes Schindelin wrote:\n\n> On Fri, 20 Nov 2015, Jeff King wrote:\n> \n> > * pt/http-socks-proxy (2015-11-20) 1 commit\n> >   (merged to 'next' on 2015-11-20 at dc6ae48)\n> >  + remote-http(s): support SOCKS proxies\n> > \n> >  Add support for talking http/https over socks proxy.\n> > \n> >  Will cook in 'next'.\n> \n> With all due respect, I do not thing this needs more cooking, as it\n> \n> 1. was tested extensively by yours truly in the Git for Windows context,\n>    and it\n> \n> 2. cannot possibly break anything because it tests specifically for the\n>    \"socks:\" prefix. It is a pure new feature.\n\nAny time I want to say \"cannot possibly\" I start to get very worried\nthat I have missed something. :)\n\nI do think this topic looks OK, but it just made it into next during the\nlast integration cycle (it was waiting on Pat's signoff, which I\namended). I think it should be OK to cook in next for a few days and\nthen merge to master (i.e., plenty of time for v2.7).\n\nThanks (and thank you for extra feedback; especially because of the\nmaintainer switch I do not have full context on all of the topics).\n\n-Peff\n"},{"id":"273614","messageId":"20151123185812.GC2597@sigill.intra.peff.net","threadId":"40841","inReplyTo":"CAOLa=ZRpvd-Nd9HiZMt6aZF9bi5i1MHNDZUSdUsGC9C-t+2bSg@mail.gmail.com","subject":"Re: What's cooking in git.git (Nov 2015, #03; Fri, 20)","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2015-11-23T18:58:12Z","receivedAt":"2015-11-23T18:58:12Z","isPatch":false,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Mon, Nov 23, 2015 at 12:02:35AM +0530, Karthik Nayak wrote:\n\n> > * kn/for-each-branch-remainder (2015-10-02) 9 commits\n> >  - branch: implement '--format' option\n> >  - branch: use ref-filter printing APIs\n> >  - ref-filter: make %(upstream:track) prints \"[gone]\" for invalid upstreams\n> >  - ref-filter: introduce format_ref_array_item()\n> >  - ref-filter: adopt get_head_description() from branch.c\n> >  - ref-filter: modify \"%(objectname:short)\" to take length\n> >  - ref-filter: add support for %(path) atom\n> >  - ref-filter: implement %(if:equals=<string>) and %(if:notequals=<string>)\n> >  - ref-filter: implement %(if), %(then), and %(else) atoms\n> >\n> >  More unification among \"branch -l\", \"tag -l\" and \"for-each-ref --format\".\n> >\n> >  Expecting a reroll.\n> >  ($gmane/278926)\n> >\n> \n> This series is supposed to follow this:\n> http://thread.gmane.org/gmane.comp.version-control.git/281180 which I\n> recently sent.\n> So replace \"for-each-branch-remainder\" with this in \"Whats cooking\"?\n\nThanks, it was on my \"leftover topics to pick up\" list. I'll make sure\nit gets updated in the next cycle.\n\n-Peff\n"},{"id":"273615","messageId":"20151123185851.GD2597@sigill.intra.peff.net","threadId":"40841","inReplyTo":"5652D718.9070201@diamand.org","subject":"Re: What's cooking in git.git (Nov 2015, #03; Fri, 20)","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2015-11-23T18:58:51Z","receivedAt":"2015-11-23T18:58:51Z","isPatch":false,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Mon, Nov 23, 2015 at 09:06:32AM +0000, Luke Diamand wrote:\n\n> >  Some commits need better explanation.\n> >\n> >  Waiting for a reroll.\n> >\n> >\n> >* ld/p4-detached-head (2015-09-09) 2 commits\n> >  - git-p4: work with a detached head\n> >  - git-p4: add failing test for submit from detached head\n> \n> Rerolled on the 21st.\n\nThanks, I\"ll pick that up in the next cycle.\n\n-Peff\n"},{"id":"273637","messageId":"565433A9.5050707@drmicha.warpmail.net","threadId":"40841","inReplyTo":"20151120140937.GA17079@sigill.intra.peff.net","subject":"Re: What's cooking in git.git (Nov 2015, #03; Fri, 20)","fromName":"Michael J Gruber","fromEmail":"git@drmicha.warpmail.net","sentAt":"2015-11-24T09:53:45Z","receivedAt":"2015-11-24T09:53:45Z","isPatch":false,"sender":{"key":"git@grubix.eu","avatar":"https://avatars.githubusercontent.com/u/233215?v=4"},"body":"Jeff King venit, vidit, dixit 20.11.2015 15:09:\n> What's cooking in git.git (Nov 2015, #03; Fri, 20)\n> --------------------------------------------------\n> \n> Here are the topics that have been cooking.  Commits prefixed with\n> '-' are only in 'pu' (proposed updates) while commits prefixed with\n> '+' are in 'next'.\n> \n> Sorry for the extreme delay in pushing out my tree. I ended up busier\n> than I expected during the first week of Junio's absence, and then it\n> took me a while to dig myself out of the ever-filling hole of incoming\n> topics. :)\n> \n> Expect quite a few new topics in this edition.  A number of them have\n> seen review already, and I'm planning to merge them to \"next\" fairly\n> quickly (I may do another integration cycle late tonight or tomorrow\n> with those changes).\n> \n> I still have a few threads to comb through on the list. If you don't see\n> the latest version of your topic here, please feel free to ping me, or\n> to repost.\n> \n> You can find the normal integration branches at:\n> \n>     https://github.com/git/git/\n> \n> and all topic branches at:\n> \n>     https://github.com/peff/git/\n> \n> But note that I will _not_ be pushing to kernel.org.\n\nDoes peff/git include the integration branches, too?\n\nAlso, that one should be uncontroversial (f[l]amous last words):\n\nFrom: Michael J Gruber <git@drmicha.warpmail.net>\nSubject: [PATCH] Documentation/diff: give --word-diff-regex=. example\nDate: Fri, 20 Nov 2015 14:36:14 +0100\n\nMessage-ID:\n<6697f80b679b2bc910aa02a0fc945453be38c532.1448026505.git.git@drmicha.warpmail.net>\n\nhttp://permalink.gmane.org/gmane.comp.version-control.git/281520>\n\nThanks for your work!\n\nMichael\n"},{"id":"273650","messageId":"20151124204259.GD7174@sigill.intra.peff.net","threadId":"40841","inReplyTo":"565433A9.5050707@drmicha.warpmail.net","subject":"Re: What's cooking in git.git (Nov 2015, #03; Fri, 20)","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2015-11-24T20:43:00Z","receivedAt":"2015-11-24T20:43:00Z","isPatch":false,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Tue, Nov 24, 2015 at 10:53:45AM +0100, Michael J Gruber wrote:\n\n> > and all topic branches at:\n> > \n> >     https://github.com/peff/git/\n> > \n> > But note that I will _not_ be pushing to kernel.org.\n> \n> Does peff/git include the integration branches, too?\n\nYes, it does.\n\n> Also, that one should be uncontroversial (f[l]amous last words):\n> \n> From: Michael J Gruber <git@drmicha.warpmail.net>\n> Subject: [PATCH] Documentation/diff: give --word-diff-regex=. example\n> Date: Fri, 20 Nov 2015 14:36:14 +0100\n> \n> Message-ID:\n> <6697f80b679b2bc910aa02a0fc945453be38c532.1448026505.git.git@drmicha.warpmail.net>\n\nThanks. It came while I was doing the cycle. I'll include it in the\ncurrent one.\n\n-Peff\n"},{"id":"273659","messageId":"20151124220410.GA5030@wheezy.local","threadId":"40841","inReplyTo":"20151120140937.GA17079@sigill.intra.peff.net","subject":"Re: What's cooking in git.git (Nov 2015, #03; Fri, 20)","fromName":"Max Kirillov","fromEmail":"max@max630.net","sentAt":"2015-11-24T22:04:10Z","receivedAt":"2015-11-24T22:04:10Z","isPatch":false,"sender":{"key":"max@max630.net","avatar":"https://avatars.githubusercontent.com/u/381560?v=4"},"body":"On Fri, Nov 20, 2015 at 09:09:37AM -0500, Jeff King wrote:\n> * mk/blame-first-parent (2015-11-20) 1 commit\n>  - blame: fix object casting regression\n> \n>  Regression fix for a topic already in master.\n> \n>  Will merge to 'next'.\n\nYou mistyped my name in the commit message of 044e0ad679 :)\n"},{"id":"273660","messageId":"20151124220626.GA8842@sigill.intra.peff.net","threadId":"40841","inReplyTo":"20151124220410.GA5030@wheezy.local","subject":"Re: What's cooking in git.git (Nov 2015, #03; Fri, 20)","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2015-11-24T22:06:26Z","receivedAt":"2015-11-24T22:06:26Z","isPatch":false,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Wed, Nov 25, 2015 at 12:04:10AM +0200, Max Kirillov wrote:\n\n> On Fri, Nov 20, 2015 at 09:09:37AM -0500, Jeff King wrote:\n> > * mk/blame-first-parent (2015-11-20) 1 commit\n> >  - blame: fix object casting regression\n> > \n> >  Regression fix for a topic already in master.\n> > \n> >  Will merge to 'next'.\n> \n> You mistyped my name in the commit message of 044e0ad679 :)\n\nArgh, sorry about that. I even remember checking it because I wanted to\nmake sure I got the correct number of l's. But vowels, eh, it's fine. :)\n\nWill fix. Thanks for catching it.\n\n-Peff\n"}]}