{"thread":{"id":"40873","subject":"What's cooking in git.git (Nov 2015, #04; Tue, 24)","startedAt":"2015-11-25T01:07:23Z","lastAt":"2015-12-01T23:10:44Z","messageCount":7,"participants":["Jeff King","John Keeping","brian m. carlson"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"273681","messageId":"20151125010722.GA23632@sigill.intra.peff.net","threadId":"40873","inReplyTo":null,"subject":"What's cooking in git.git (Nov 2015, #04; Tue, 24)","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2015-11-25T01:07:23Z","receivedAt":"2015-11-25T01:07:23Z","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, #04; Tue, 24)\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\nLots of little topics, most of which should go to maint/master fairly\nquickly (actually, writing this I just realized that several of them\nwhich I've annotated as \"merge to master\" can go to maint. I'm out of\ntime for today, so I'll fix that up in the next cycle).\n\nThere are a few topics which need review, especially from subsystem\nfolks. In some cases, they may simply need an Ack that the most recent\nversion of a series is OK.\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[New Topics]\n\n* bb/merge-marker-crlf (2015-11-24) 1 commit\n - merge-file: consider core.crlf when writing merge markers\n\n Write out merge markers using system end-of-line convention.\n\n Waiting for a re-roll to handle gitattributes.\n\n\n* cb/ssl-config-pathnames (2015-11-24) 1 commit\n  (merged to 'next' on 2015-11-24 at 658a9c9)\n + http: treat config options sslCAPath and sslCAInfo as paths\n\n Allow tilde-expansion in some http config variables.\n\n Will merge to 'master'.\n\n\n* dk/gc-more-wo-pack (2015-11-24) 3 commits\n - gc: Clean garbage .bitmap files from pack dir\n - t5304: Add test for .bitmap garbage files\n - prepare_packed_git(): find more garbage\n\n Follow-on to dk/gc-idx-wo-pack topic, to clean up stale\n .bitmap and .keep files.\n\n Waiting for review.\n\n\n* dt/http-range (2015-11-11) 1 commit\n  (merged to 'next' on 2015-11-24 at d342999)\n + http: fix some printf format warnings\n\n Portability fix for a topic already in 'master'.\n\n Will merge to 'master'.\n\n\n* jk/send-email-ssl-errors (2015-11-24) 1 commit\n - send-email: enable SSL level 1 debug output\n\n Improve error reporting when SMTP TLS fails.\n\n Will merge to 'next'.\n\n\n* mg/doc-word-diff-example (2015-11-24) 1 commit\n  (merged to 'next' on 2015-11-24 at 5ba28db)\n + Documentation/diff: give --word-diff-regex=. example\n\n Will merge to 'master'.\n\n\n* mr/ff-refs (2015-11-24) 5 commits\n - ff-refs: Add tests\n - ff-refs: Add documentation\n - ff-refs: add --dry-run and --skip-worktree options\n - ff-refs: update each updatable ref\n - ff-refs: builtin cmd to check and fast forward local refs to their upstream\n\n Specialized command to fast-forward refs to match their upstream.\n\n I remain skeptical that this is necessary or sufficient. Comments\n welcome.\n\n Will hold.\n\n\n* ps/rebase-keep-empty (2015-11-24) 2 commits\n - rebase: fix preserving commits with --keep-empty\n - rebase: test broken behavior with --keep-empty\n\n Keep duplicate commits via rebase --keep-empty.\n\n I'm not sure if I agree with this interpretation of the \"rebase\n --keep-empty\" documentation, but I haven't thought too hard about it.\n Comments welcome.\n\n Waiting for review.\n\n\n* rm/subtree-unwrap-tags (2015-11-24) 1 commit\n - contrib/subtree: unwrap tag refs\n\n Waiting for review from subtree folks.\n\n\n* sg/bash-prompt-dirty-orphan (2015-11-24) 3 commits\n  (merged to 'next' on 2015-11-24 at ac6eb1c)\n + bash prompt: indicate dirty index even on orphan branches\n + bash prompt: remove a redundant 'git diff' option\n + bash prompt: test dirty index and worktree while on an orphan branch\n\n Produce correct \"dirty\" marker for shell prompts, even when we\n are on an orphan branch.\n\n Will cook in 'next', then merge to 'master'.\n\n\n* sg/filter-branch-dwim-ambiguity (2015-11-24) 1 commit\n  (merged to 'next' on 2015-11-24 at fe596a6)\n + filter-branch: deal with object name vs. pathname ambiguity in tree-filter\n\n Fix for a corner case in filter-branch.\n\n Will merge to 'master'.\n\n\n* sg/sh-require-clean-orphan (2015-11-24) 2 commits\n - sh-setup: make require_clean_work_tree() work on orphan branches\n - Add tests for git-sh-setup's require_clean_work_tree()\n\n Allow users of git-sh-setup to handle orphan branch state.\n\n This series takes the conservative route of requiring scripts to opt\n into the looser behavior, at the expense of carrying around a new\n option-flag forever. I'm not sure if we need to do so. Comments\n welcome.\n\n Will merge to 'next' in a few days.\n\n\n* tb/ls-files-eol (2015-11-24) 1 commit\n - ls-files: Add eol diagnostics\n\n Add options to ls-files to help diagnose end-of-line problems.\n\n This latest round hasn't gotten any review yet.\n\n Waiting for review.\n\n--------------------------------------------------\n[Graduated to \"master\"]\n\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* 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[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* 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* ar/doc-env-variable-format (2015-11-11) 1 commit\n  (merged to 'next' on 2015-11-24 at 5ddf33e)\n + Documentation: make environment variable formatting more consistent\n\n Minor documentation fixup.\n\n Will merge to 'master'.\n\n\n* ld/p4-detached-head (2015-11-24) 3 commits\n  (merged to 'next' on 2015-11-24 at 36ab36a)\n + git-p4: work with a detached head\n + git-p4: add option to system() to return subshell status\n + git-p4: add failing test for submit from detached head\n\n Make git-p4 work on a detached head.\n\n Will merge to 'master'.\n\n\n* cb/hook-sigpipe (2015-11-16) 1 commit\n  (merged to 'next' on 2015-11-24 at 0bf4228)\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 'master'.\n\n\n* dg/subtree-test-cleanup (2015-11-13) 7 commits\n  (merged to 'next' on 2015-11-24 at 1297941)\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 'master'.\n\n\n* dk/check-ignore-docs (2015-11-24) 1 commit\n  (merged to 'next' on 2015-11-24 at 0cce5c5)\n + check-ignore: correct documentation about output\n\n Documentation clarification for \"check-ignore\" without \"--verbose\".\n\n Will merge to 'master'.\n\n\n* dk/rerere-train-quoting (2015-11-20) 1 commit\n  (merged to 'next' on 2015-11-24 at f9fa96e)\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 'master'.\n\n\n* dk/t5813-unc-paths (2015-11-20) 1 commit\n  (merged to 'next' on 2015-11-24 at 204e4a8)\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 'master'.\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  (merged to 'next' on 2015-11-24 at c2b8bdf)\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 'master'.\n\n\n* jk/filter-branch-no-index (2015-11-06) 1 commit\n  (merged to 'next' on 2015-11-24 at e31946e)\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 Will merge to 'master' two cycles from now.\n\n\n* jk/send-email-ca-path (2015-11-24) 1 commit\n  (merged to 'next' on 2015-11-24 at 923b803)\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 Will merge to 'master'.\n\n\n* jk/send-email-complete-aliases (2015-11-20) 2 commits\n  (merged to 'next' on 2015-11-24 at a50094f)\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 Will merge to 'master' two cycles from now.\n\n\n* jk/send-email-expand-paths (2015-11-20) 1 commit\n  (merged to 'next' on 2015-11-24 at d32fa4d)\n + send-email: expand path in sendemail.smtpsslcertpath config\n\n Expand paths in some send-email config variables.\n\n Will merge to 'master'.\n\n\n* js/test-modernize-t9300 (2015-11-20) 7 commits\n  (merged to 'next' on 2015-11-24 at d399494)\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 'master'.\n\n\n* ls/p4-test-timeouts (2015-11-20) 3 commits\n  (merged to 'next' on 2015-11-24 at 905cff8)\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 'master'.\n\n\n* ls/test-must-fail-sigpipe (2015-11-24) 3 commits\n - SQUASH???\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 hold pending logic cleanups.\n\n\n* mc/push-recurse-submodules-config (2015-11-20) 1 commit\n  (merged to 'next' on 2015-11-24 at 3644d4b)\n + push: add recurseSubmodules config option\n\n Add new config to avoid typing \"--recurse-submodules\" on each push.\n\n Waiting for review from submodule folks.\n\n\n* mk/blame-first-parent (2015-11-24) 1 commit\n  (merged to 'next' on 2015-11-24 at a2ee2a4)\n + blame: fix object casting regression\n\n Regression fix for a topic already in master.\n\n Will merge to 'master'.\n\n\n* np/credential-cache-sighup (2015-11-20) 1 commit\n  (merged to 'next' on 2015-11-24 at 410167f)\n + credential-cache: new option to ignore sighup\n\n Workaround for using credential-cache with emacs.\n\n Will merge to 'master' two cycles from now.\n\n\n* rs/fsck-nul-header (2015-11-20) 2 commits\n  (merged to 'next' on 2015-11-24 at 093b3d6)\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 'master'.\n\n\n* rs/parseopt-short-help (2015-11-20) 5 commits\n  (merged to 'next' on 2015-11-24 at f22b6e0)\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* dt/refs-backend-pre-vtable (2015-11-20) 10 commits\n  (merged to 'next' on 2015-11-24 at 8fd7293)\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 Will cook in 'next'.\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 Needs review.\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* sb/submodule-parallel-update (2015-11-20) 27 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  (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 tangled with 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-11-24) 1 commit\n  (merged to 'next' on 2015-11-24 at cf2dc76)\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 Will merge to 'master'.\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* 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 merge to 'master'.\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-24) 17 commits\n . run-command: detect finished children by closed pipe rather than waitpid\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 tangled with 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 Is everybody happy with the topic commit?\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":"273716","messageId":"20151125101342.GE18913@serenity.lan","threadId":"40873","inReplyTo":"20151125010722.GA23632@sigill.intra.peff.net","subject":"Re: What's cooking in git.git (Nov 2015, #04; Tue, 24)","fromName":"John Keeping","fromEmail":"john@keeping.me.uk","sentAt":"2015-11-25T10:13:42Z","receivedAt":"2015-11-25T10:13:42Z","isPatch":false,"sender":{"key":"john@keeping.me.uk","avatar":"https://avatars.githubusercontent.com/u/1702081?v=4"},"body":"On Tue, Nov 24, 2015 at 08:07:23PM -0500, Jeff King wrote:\n> * jk/send-email-ssl-errors (2015-11-24) 1 commit\n>  - send-email: enable SSL level 1 debug output\n> \n>  Improve error reporting when SMTP TLS fails.\n> \n>  Will merge to 'next'.\n\nCan you hold off on this one?  I think my last-minute change not to\nswitch on --smtp-debug has introduced a Perl warning that needs to be\nsuppressed.\n"},{"id":"273717","messageId":"20151125101543.GA2738@sigill.intra.peff.net","threadId":"40873","inReplyTo":"20151125101342.GE18913@serenity.lan","subject":"Re: What's cooking in git.git (Nov 2015, #04; Tue, 24)","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2015-11-25T10:15:44Z","receivedAt":"2015-11-25T10:15:44Z","isPatch":false,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Wed, Nov 25, 2015 at 10:13:42AM +0000, John Keeping wrote:\n\n> On Tue, Nov 24, 2015 at 08:07:23PM -0500, Jeff King wrote:\n> > * jk/send-email-ssl-errors (2015-11-24) 1 commit\n> >  - send-email: enable SSL level 1 debug output\n> > \n> >  Improve error reporting when SMTP TLS fails.\n> > \n> >  Will merge to 'next'.\n> \n> Can you hold off on this one?  I think my last-minute change not to\n> switch on --smtp-debug has introduced a Perl warning that needs to be\n> suppressed.\n\nSure. Thanks for letting me know.\n\n-Peff\n"},{"id":"273808","messageId":"20151128154010.GA15706@vauxhall.crustytoothpaste.net","threadId":"40873","inReplyTo":"20151125010722.GA23632@sigill.intra.peff.net","subject":"Re: What's cooking in git.git (Nov 2015, #04; Tue, 24)","fromName":"brian m. carlson","fromEmail":"sandals@crustytoothpaste.net","sentAt":"2015-11-28T15:40:10Z","receivedAt":"2015-11-28T15:40:10Z","isPatch":false,"sender":{"key":"sandals@crustytoothpaste.net","avatar":"https://avatars.githubusercontent.com/u/497054?v=4"},"body":"On Tue, Nov 24, 2015 at 08:07:23PM -0500, Jeff King wrote:\n> What's cooking in git.git (Nov 2015, #04; Tue, 24)\n> --------------------------------------------------\n> [New Topics]\n\nI noticed the object_id series was missing from this list.  Was there\nsomething that needed fixing or a reroll?\n-- \nbrian m. carlson / brian with sandals: Houston, Texas, US\n+1 832 623 2791 | https://www.crustytoothpaste.net/~bmc | My opinion only\nOpenPGP: RSA v4 4096b: 88AC E9B2 9196 305B A994 7552 F1BA 225C 0223 B187\n"},{"id":"273809","messageId":"20151128163543.GA26759@sigill.intra.peff.net","threadId":"40873","inReplyTo":"20151128154010.GA15706@vauxhall.crustytoothpaste.net","subject":"Re: What's cooking in git.git (Nov 2015, #04; Tue, 24)","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2015-11-28T16:35:43Z","receivedAt":"2015-11-28T16:35:43Z","isPatch":false,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Sat, Nov 28, 2015 at 03:40:10PM +0000, brian m. carlson wrote:\n\n> On Tue, Nov 24, 2015 at 08:07:23PM -0500, Jeff King wrote:\n> > What's cooking in git.git (Nov 2015, #04; Tue, 24)\n> > --------------------------------------------------\n> > [New Topics]\n> \n> I noticed the object_id series was missing from this list.  Was there\n> something that needed fixing or a reroll?\n\nThanks for bringing this up; I meant to send a note but forgot.\n\nI got a bunch of conflicts trying to merge it into 'next' and 'pu' and\npunted on it. I think the tricky bits are coming from\ndt/refs-backend-pre-vtable, where there was a lot of code movement.\n\n-Peff\n"},{"id":"273813","messageId":"20151128170932.GC15706@vauxhall.crustytoothpaste.net","threadId":"40873","inReplyTo":"20151128163543.GA26759@sigill.intra.peff.net","subject":"Re: What's cooking in git.git (Nov 2015, #04; Tue, 24)","fromName":"brian m. carlson","fromEmail":"sandals@crustytoothpaste.net","sentAt":"2015-11-28T17:09:32Z","receivedAt":"2015-11-28T17:09:32Z","isPatch":false,"sender":{"key":"sandals@crustytoothpaste.net","avatar":"https://avatars.githubusercontent.com/u/497054?v=4"},"body":"On Sat, Nov 28, 2015 at 11:35:43AM -0500, Jeff King wrote:\n> On Sat, Nov 28, 2015 at 03:40:10PM +0000, brian m. carlson wrote:\n> \n> > On Tue, Nov 24, 2015 at 08:07:23PM -0500, Jeff King wrote:\n> > > What's cooking in git.git (Nov 2015, #04; Tue, 24)\n> > > --------------------------------------------------\n> > > [New Topics]\n> > \n> > I noticed the object_id series was missing from this list.  Was there\n> > something that needed fixing or a reroll?\n> \n> Thanks for bringing this up; I meant to send a note but forgot.\n> \n> I got a bunch of conflicts trying to merge it into 'next' and 'pu' and\n> punted on it. I think the tricky bits are coming from\n> dt/refs-backend-pre-vtable, where there was a lot of code movement.\n\nI think as for merging into the latest pu, the thing you want to do in\nrefs.c is simply take what pu has.  You'll have to fix up one additional\nstruct object call site.  The same thing goes for builtin/merge.c and\nbuiltin/branch.c, where the code I changed has since been eliminated.\n\nI also noticed that merge-recursive.c and builtin/ff-refs.c needed some\nminor fixups as well, but a quick compile will show you where those are.\nI've included a diff for those two below.\n\n-----%<-----\ndiff --git a/builtin/ff-refs.c b/builtin/ff-refs.c\nindex ae68cfbc..c9d37092 100644\n--- a/builtin/ff-refs.c\n+++ b/builtin/ff-refs.c\n@@ -84,19 +84,19 @@ static void do_ref_update(struct ff_ref_data *data, struct ff_ref_details *detai\n \t\tset_git_dir(details->wt->git_dir);\n \t\tread_index(&the_index);\n \n-\t\tif (checkout_fast_forward(details->branch_commit->object.sha1,\n-\t\t\t\tdetails->upstream_commit->object.sha1, 1))\n+\t\tif (checkout_fast_forward(details->branch_commit->object.oid.hash,\n+\t\t\t\tdetails->upstream_commit->object.oid.hash, 1))\n \t\t\tdetails->result_type = NON_FAST_FORWARD;\n-\t\telse if (update_ref(\"ff-refs\", refname, details->upstream_commit->object.sha1,\n-\t\t\t\tdetails->branch_commit->object.sha1, 0, UPDATE_REFS_QUIET_ON_ERR)) {\n+\t\telse if (update_ref(\"ff-refs\", refname, details->upstream_commit->object.oid.hash,\n+\t\t\t\tdetails->branch_commit->object.oid.hash, 0, UPDATE_REFS_QUIET_ON_ERR)) {\n \t\t\tdetails->result_type = UNABLE_TO_UPDATE;\n \t\t\trun_hook_le(NULL, \"post-merge\", \"0\", NULL);\n \t\t}\n \t\tdiscard_index(&the_index);\n \t\tchdir(path.buf);\n \t\tstrbuf_release(&path);\n-\t} else if (update_ref(\"ff-refs\", refname, details->upstream_commit->object.sha1,\n-\t\t\tdetails->branch_commit->object.sha1, 0, UPDATE_REFS_QUIET_ON_ERR))\n+\t} else if (update_ref(\"ff-refs\", refname, details->upstream_commit->object.oid.hash,\n+\t\t\tdetails->branch_commit->object.oid.hash, 0, UPDATE_REFS_QUIET_ON_ERR))\n \t\tdetails->result_type = UNABLE_TO_UPDATE;\n }\n \n@@ -207,7 +207,7 @@ static int analize_refs(const char *refname,\n \t\t\t\t\tdetails->upstream_commit);\n \t\t\tdetails->merge_base = bases->item;\n \n-\t\t\tif (!hashcmp(upstream_hash, details->merge_base->object.sha1))\n+\t\t\tif (!hashcmp(upstream_hash, details->merge_base->object.oid.hash))\n \t\t\t\tdetails->result_type = UP_TO_DATE;\n \n \t\t\telse if (!in_merge_bases(details->branch_commit, details->upstream_commit))\ndiff --git a/merge-recursive.c b/merge-recursive.c\nindex 09d99640..50a16ebf 100644\n--- a/merge-recursive.c\n+++ b/merge-recursive.c\n@@ -1835,8 +1835,8 @@ int merge_trees(struct merge_options *o,\n \tif (code != 0) {\n \t\tif (o->gently)\n \t\t\treturn error(_(\"merging of trees %s and %s failed\"),\n-\t\t\t    sha1_to_hex(head->object.sha1),\n-\t\t\t    sha1_to_hex(merge->object.sha1));\n+\t\t\t    oid_to_hex(&head->object.oid),\n+\t\t\t    oid_to_hex(&merge->object.oid));\n \n \t\tif (show(o, 4) || o->call_depth)\n \t\t\tdie(_(\"merging of trees %s and %s failed\"),\n-----%<-----\n-- \nbrian m. carlson / brian with sandals: Houston, Texas, US\n+1 832 623 2791 | https://www.crustytoothpaste.net/~bmc | My opinion only\nOpenPGP: RSA v4 4096b: 88AC E9B2 9196 305B A994 7552 F1BA 225C 0223 B187\n"},{"id":"273882","messageId":"20151201231044.GA13245@sigill.intra.peff.net","threadId":"40873","inReplyTo":"20151128170932.GC15706@vauxhall.crustytoothpaste.net","subject":"Re: What's cooking in git.git (Nov 2015, #04; Tue, 24)","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2015-12-01T23:10:44Z","receivedAt":"2015-12-01T23:10:44Z","isPatch":false,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Sat, Nov 28, 2015 at 05:09:32PM +0000, brian m. carlson wrote:\n\n> > I got a bunch of conflicts trying to merge it into 'next' and 'pu' and\n> > punted on it. I think the tricky bits are coming from\n> > dt/refs-backend-pre-vtable, where there was a lot of code movement.\n> \n> I think as for merging into the latest pu, the thing you want to do in\n> refs.c is simply take what pu has.  You'll have to fix up one additional\n> struct object call site.  The same thing goes for builtin/merge.c and\n> builtin/branch.c, where the code I changed has since been eliminated.\n> \n> I also noticed that merge-recursive.c and builtin/ff-refs.c needed some\n> minor fixups as well, but a quick compile will show you where those are.\n> I've included a diff for those two below.\n\nThanks, this gave me an opportunity to play with Junio's merge-fix\nscripts. :) The result will be in the \"pu\" I push out shortly.\n\n-Peff\n"}]}