{"thread":{"id":"47581","subject":"What's cooking in git.git (Jan 2018, #02; Tue, 9)","startedAt":"2018-01-09T23:33:18Z","lastAt":"2018-01-18T22:31:25Z","messageCount":8,"participants":["Junio C Hamano","Ævar Arnfjörð Bjarmason","Jeff Hostetler","Christian Couder","Jonathan Tan"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"336330","messageId":"xmqqa7xm38wc.fsf@gitster.mtv.corp.google.com","threadId":"47581","inReplyTo":null,"subject":"What's cooking in git.git (Jan 2018, #02; Tue, 9)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2018-01-09T23:33:07Z","receivedAt":"2018-01-09T23:33:18Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"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'.  The ones marked with '.' do not appear in any of\nthe integration branches, but I am still holding onto them.\n\nYou can find the changes described here in the integration branches\nof the repositories listed at\n\n    http://git-blame.blogspot.com/p/git-public-repositories.html\n\n--------------------------------------------------\n[Graduated to \"master\"]\n\n* ab/dc-sha1-loose-ends (2017-12-28) 1 commit\n  (merged to 'next' on 2018-01-05 at 7186e81793)\n + Makefile: NO_OPENSSL=1 should no longer imply BLK_SHA1=1\n\n Tying loose ends for the recent integration work of\n collision-detecting SHA-1 implementation.\n\n\n* bc/submitting-patches-in-asciidoc (2018-01-03) 1 commit\n  (merged to 'next' on 2018-01-05 at 92dd960a56)\n + doc/SubmittingPatches: improve text formatting\n\n Doc readability update.\n\n\n* bp/fsmonitor (2017-12-18) 1 commit\n  (merged to 'next' on 2017-12-27 at ce216e2978)\n + p7519: improve check for prerequisite WATCHMAN\n\n Test fix.\n\n\n* bw/path-doc (2017-12-13) 1 commit\n  (merged to 'next' on 2017-12-19 at 2cddee77ca)\n + path: document path functions\n\n Doc updates.\n\n\n* bw/protocol-v1 (2018-01-04) 1 commit\n  (merged to 'next' on 2018-01-05 at 47a5e0039a)\n + http: fix v1 protocol tests with apache httpd < 2.4\n\n Test fix for a topic already in 'master'.\n\n\n* cc/skip-to-optional-val (2017-12-11) 7 commits\n  (merged to 'next' on 2017-12-27 at 1b189d8556)\n + t4045: reindent to make helpers readable\n + diff: add tests for --relative without optional prefix value\n + diff: use skip_to_optional_arg_default() in parsing --relative\n + diff: use skip_to_optional_arg_default()\n + diff: use skip_to_optional_arg()\n + index-pack: use skip_to_optional_arg()\n + git-compat-util: introduce skip_to_optional_arg()\n\n Introduce a helper to simplify code to parse a common pattern that\n expects either \"--key\" or \"--key=<something>\".\n\n\n* db/doc-config-section-names-with-bs (2017-12-22) 1 commit\n  (merged to 'next' on 2017-12-28 at e744b99449)\n + config.txt: document behavior of backslashes in subsections\n\n Doc update.\n\n\n* ew/svn-crlf (2017-12-14) 2 commits\n  (merged to 'next' on 2017-12-27 at 1b81bd634d)\n + Merge branch 'svn-crlf' of git://bogomips.org/git-svn into ew/svn-crlf\n + git-svn: convert CRLF to LF in commit message to SVN\n\n \"git svn\" has been updated to strip CRs in the commit messages, as\n recent versions of Subversion rejects them.\n\n\n* hi/merge-verify-sig-config (2017-12-19) 3 commits\n  (merged to 'next' on 2017-12-27 at 34360fb1c1)\n + t5573, t7612: clean up after unexpected success of 'pull' and 'merge'\n  (merged to 'next' on 2017-12-14 at cdc511dc36)\n + t: add tests for pull --verify-signatures\n + merge: add config option for verifySignatures\n\n \"git merge\" learned to pay attention to merge.verifySignatures\n configuration variable and pretend as if '--verify-signatures'\n option was given from the command line.\n\n\n* jd/fix-strbuf-add-urlencode-bytes (2017-12-22) 1 commit\n  (merged to 'next' on 2017-12-28 at 7f4f291966)\n + strbuf: fix urlencode format string on signed char\n\n Bytes with high-bit set were encoded incorrectly and made\n credential helper fail.\n\n\n* jh/memihash-opt (2017-12-22) 1 commit\n  (merged to 'next' on 2017-12-28 at bf96e0d849)\n + t/helper/test-lazy-name-hash: fix compilation\n\n Squelch compiler warning.\n\n\n* jh/partial-clone-doc (2017-12-14) 1 commit\n  (merged to 'next' on 2017-12-27 at 3695847773)\n + partial-clone: design doc\n\n\n* jk/doc-diff-options (2018-01-04) 1 commit\n  (merged to 'next' on 2018-01-05 at 11a42ea807)\n + docs/diff-options: clarify scope of diff-filter types\n\n Doc update.\n\n\n* jk/test-suite-tracing (2017-12-08) 4 commits\n  (merged to 'next' on 2017-12-27 at 7034a51474)\n + t/Makefile: introduce TEST_SHELL_PATH\n + test-lib: make \"-x\" work with \"--verbose-log\"\n + t5615: avoid re-using descriptor 4\n + test-lib: silence \"-x\" cleanup under bash\n\n Assorted fixes around running tests with \"-x\" tracing option.\n\n\n* js/enhanced-version-info (2017-12-14) 2 commits\n  (merged to 'next' on 2017-12-27 at a95dd96a78)\n + version --build-options: report commit, too, if possible\n + version --build-options: also report host CPU\n\n \"git version --build-options\" learned to report the host CPU and\n the exact commit object name the binary was built from.\n\n\n* js/sequencer-cleanups (2017-12-27) 5 commits\n  (merged to 'next' on 2017-12-28 at 23c10afb09)\n + sequencer: do not invent whitespace when transforming OIDs\n + sequencer: report when noop has an argument\n + sequencer: remove superfluous conditional\n + sequencer: strip bogus LF at end of error messages\n + rebase: do not continue when the todo list generation failed\n\n Code cleanup.\n\n\n* js/test-with-ws-in-path (2018-01-03) 2 commits\n  (merged to 'next' on 2018-01-05 at 6438e1c186)\n + t0302 & t3900: add forgotten quotes\n + Allow the test suite to pass in a directory whose name contains spaces\n\n Test fixes.\n\n\n* jt/transport-hide-vtable (2017-12-14) 2 commits\n  (merged to 'next' on 2017-12-27 at 8dc27cfb53)\n + transport: make transport vtable more private\n + clone, fetch: remove redundant transport check\n\n Code clean-up.\n\n\n* ks/doc-previous-checkout (2017-12-19) 1 commit\n  (merged to 'next' on 2017-12-27 at c706239a69)\n + Doc/check-ref-format: clarify information about @{-N} syntax\n\n Doc update.\n\n\n* ks/rebase-error-messages (2017-12-19) 3 commits\n  (merged to 'next' on 2017-12-27 at 80c62260ad)\n + rebase: rebasing can also be done when HEAD is detached\n + rebase: distinguish user input by quoting it\n + rebase: consistently use branch_name variable\n\n Error messages from \"git rebase\" have been somewhat cleaned up.\n\n\n* ld/p4-multiple-shelves (2017-12-22) 1 commit\n  (merged to 'next' on 2017-12-28 at 6c29703427)\n + git-p4: update multiple shelved change lists\n\n \"git p4\" update.\n\n\n* nm/imap-send-quote-server-folder-name (2017-12-18) 1 commit\n  (merged to 'next' on 2017-12-27 at 79326a0b77)\n + imap-send: URI encode server folder\n\n \"git imap-send\" did not correctly quote the folder name when\n making a request to the server, which has been corrected.\n\n\n* ra/prompt-eread-fix (2017-12-06) 2 commits\n  (merged to 'next' on 2017-12-27 at ae870af11d)\n + git-prompt: fix reading files with windows line endings\n + git-prompt: make __git_eread intended use explicit\n\n Update the shell prompt script (in contrib/) to strip trailing CR\n from strings read from various \"state\" files.\n\n\n* rs/use-argv-array-in-child-process (2017-12-22) 2 commits\n  (merged to 'next' on 2017-12-28 at 829a621ace)\n + send-pack: use internal argv_array of struct child_process\n + http: use internal argv_array of struct child_process\n\n Code cleanup.\n\n\n* sb/describe-blob (2017-12-19) 7 commits\n  (merged to 'next' on 2017-12-27 at 1249ca9213)\n + builtin/describe.c: describe a blob\n + builtin/describe.c: factor out describe_commit\n + builtin/describe.c: print debug statements earlier\n + builtin/describe.c: rename `oid` to avoid variable shadowing\n + revision.h: introduce blob/tree walking in order of the commits\n + list-objects.c: factor out traverse_trees_and_blobs\n + t6120: fix typo in test name\n\n \"git describe\" was taught to dig trees deeper to find a\n <commit-ish>:<path> that refers to a given blob object.\n\n\n* sg/travis-check-untracked (2018-01-03) 2 commits\n  (merged to 'next' on 2018-01-05 at 424bed2fb0)\n + travis-ci: check that all build artifacts are .gitignore-d\n + travis-ci: don't store P4 and Git LFS in the working tree\n (this branch uses sg/travis-fixes and sg/travis-skip-identical-test.)\n\n Will cook in 'next'.\n\n\n* sg/travis-fixes (2017-12-27) 4 commits\n  (merged to 'next' on 2017-12-28 at 6496308a5b)\n + travis-ci: only print test failures if there are test results available\n + travis-ci: save prove state for the 32 bit Linux build\n + travis-ci: don't install default addon packages for the 32 bit Linux build\n + travis-ci: fine tune the use of 'set -x' in 'ci/*' scripts\n (this branch is used by sg/travis-check-untracked and sg/travis-skip-identical-test.)\n\n Assorted updates for TravisCI integration.\n\n Will cook in 'next'.\n\n\n* sg/travis-skip-identical-test (2018-01-02) 3 commits\n  (merged to 'next' on 2018-01-05 at 41914fc43e)\n + travis-ci: record and skip successfully built trees\n + travis-ci: create the cache directory early in the build process\n + travis-ci: print the \"tip of branch is exactly at tag\" message in color\n (this branch is used by sg/travis-check-untracked; uses sg/travis-fixes.)\n\n Avoid repeatedly testing the same tree in TravisCI that have been\n tested successfully already.\n\n Will cook in 'next'.\n\n\n* sr/http-sslverify-config-doc (2017-12-18) 1 commit\n  (merged to 'next' on 2017-12-27 at 84a461c4b5)\n + config: document default value of http.sslVerify\n\n Docfix.\n\n\n* tb/test-lint-wc-l (2017-12-22) 1 commit\n  (merged to 'next' on 2017-12-28 at 4d91ed6d51)\n + check-non-portable-shell.pl: `wc -l` may have leading WS\n\n Test update.\n\n\n* tz/lib-git-svn-svnserve-tests (2017-12-14) 2 commits\n  (merged to 'next' on 2017-12-27 at 54513f6e20)\n + t/lib-git-svn.sh: improve svnserve tests with parallel make test\n + t/lib-git-svn: cleanup inconsistent tab/space usage\n\n\n* ws/curl-http-proxy-over-https (2017-12-19) 1 commit\n  (merged to 'next' on 2017-12-27 at 895bf2f94b)\n + http: support CURLPROXY_HTTPS\n\n Git has been taught to support an https:// URL used for http.proxy\n when using recent versions of libcurl.\n\n--------------------------------------------------\n[New Topics]\n\n* ab/wildmatch-tests (2018-01-04) 7 commits\n  (merged to 'next' on 2018-01-09 at 09f0b84098)\n + wildmatch test: create & test files on disk in addition to in-memory\n + wildmatch test: perform all tests under all wildmatch() modes\n + wildmatch test: remove dead fnmatch() test code\n + wildmatch test: use a paranoia pattern from nul_match()\n + wildmatch test: don't try to vertically align our output\n + wildmatch test: use more standard shell style\n + wildmatch test: indent with tabs, not spaces\n\n More tests for wildmatch functions.\n\n Will cook in 'next'.\n\n\n* cc/codespeed (2018-01-05) 7 commits\n  (merged to 'next' on 2018-01-09 at 5599f7a085)\n + perf/run: read GIT_PERF_REPO_NAME from perf.repoName\n + perf/run: learn to send output to codespeed server\n + perf/run: learn about perf.codespeedOutput\n + perf/run: add conf_opts argument to get_var_from_env_or_config()\n + perf/aggregate: implement codespeed JSON output\n + perf/aggregate: refactor printing results\n + perf/aggregate: fix checking ENV{GIT_PERF_SUBSECTION}\n\n \"perf\" test output can be sent to codespeed server.\n\n Will cook in 'next'.\n\n\n* rs/lose-leak-pending (2017-12-28) 9 commits\n  (merged to 'next' on 2018-01-05 at 05305f7f2f)\n + commit: remove unused function clear_commit_marks_for_object_array()\n + revision: remove the unused flag leak_pending\n + checkout: avoid using the rev_info flag leak_pending\n + bundle: avoid using the rev_info flag leak_pending\n + bisect: avoid using the rev_info flag leak_pending\n + object: add clear_commit_marks_all()\n + ref-filter: use clear_commit_marks_many() in do_merge_filter()\n + commit: use clear_commit_marks_many() in remove_redundant()\n + commit: avoid allocation in clear_commit_marks_many()\n\n API clean-up around revision traversal.\n\n Will cook in 'next'.\n\n\n* sb/diff-blobfind-pickaxe (2018-01-04) 6 commits\n  (merged to 'next' on 2018-01-09 at 1c7bace3e7)\n + diff: use HAS_MULTI_BITS instead of counting bits manually\n + diff: properly error out when combining multiple pickaxe options\n + diffcore: add a pickaxe option to find a specific blob\n + diff: introduce DIFF_PICKAXE_KINDS_MASK\n + diff: migrate diff_flags.pickaxe_ignore_case to a pickaxe_opts bit\n + diff.h: make pickaxe_opts an unsigned bit field\n\n \"diff\" family of commands learned \"--find-object=<object-id>\" option\n to limit the findings to changes that involve the named object.\n\n Will cook in 'next'.\n\n\n* ab/perf-grep-threads (2018-01-04) 1 commit\n  (merged to 'next' on 2018-01-09 at 8fe1d71894)\n + perf: amend the grep tests to test grep.threads\n\n More perf tests for threaded grep\n\n Will cook in 'next'.\n\n\n* bw/protocol-v2 (2018-01-04) 26 commits\n - remote-curl: implement connect-half-duplex command\n - remote-curl: create copy of the service name\n - pkt-line: add packet_buf_write_len function\n - transport-helper: introduce connect-half-duplex\n - transport-helper: refactor process_connect_service\n - transport-helper: remove name parameter\n - fetch-pack: perform a fetch using v2\n - upload-pack: introduce fetch server command\n - push: pass ref patterns when pushing\n - fetch: pass ref patterns when fetching\n - ls-remote: pass ref patterns when requesting a remote's refs\n - transport: convert transport_get_remote_refs to take a list of ref patterns\n - transport: convert get_refs_list to take a list of ref patterns\n - connect: request remote refs using v2\n - ls-refs: introduce ls-refs server command\n - serve: introduce git-serve\n - protocol: introduce enum protocol_version value protocol_v2\n - transport: store protocol version\n - connect: discover protocol version outside of get_remote_heads\n - connect: convert get_remote_heads to use struct packet_reader\n - transport: use get_refs_via_connect to get refs\n - upload-pack: factor out processing lines\n - upload-pack: convert to a builtin\n - pkt-line: add delim packet support\n - pkt-line: introduce struct packet_reader\n - pkt-line: introduce packet_read_with_status\n\n The beginning of the next-gen transfer protocol.\n\n\n* jh/status-no-ahead-behind (2018-01-04) 4 commits\n - status: support --no-ahead-behind in long format\n - status: update short status to respect --no-ahead-behind\n - status: add --[no-]ahead-behind to status and commit for V2 format.\n - stat_tracking_info: return +1 when branches not equal\n\n Still in flux.\n\n\n* jk/abort-clone-with-existing-dest (2018-01-03) 4 commits\n  (merged to 'next' on 2018-01-09 at 789a55a9e1)\n + clone: do not clean up directories we didn't create\n + clone: factor out dir_exists() helper\n + t5600: modernize style\n + t5600: fix outdated comment about unborn HEAD\n\n \"git clone $there $here\" is allowed even when here directory exists\n as long as it is an empty directory, but the command incorrectly\n removed it upon a failure of the operation.\n\n Will cook in 'next'.\n\n\n* ls/checkout-encoding (2018-01-08) 6 commits\n - convert: add support for 'checkout-encoding' attribute\n - convert_to_git(): safe_crlf/checksafe becomes int conv_flags\n - utf8: add function to detect a missing UTF-16/32 BOM\n - utf8: add function to detect prohibited UTF-16/32 BOM\n - strbuf: add xstrdup_toupper()\n - strbuf: remove unnecessary NUL assignment in xstrdup_tolower()\n\n The new \"checkout-encoding\" attribute can ask Git to convert the\n contents to the specified encoding when checking out to the working\n tree (and the other way around when checking in).\n\n\n* ma/bisect-leakfix (2018-01-03) 1 commit\n  (merged to 'next' on 2018-01-09 at af04bd5436)\n + bisect: fix a regression causing a segfault\n\n A hotfix for a recent update that broke 'git bisect'.\n\n Will merge to 'master'.\n\n\n* mm/send-email-fallback-to-local-mail-address (2018-01-08) 3 commits\n - send-email: add test for Linux's get_maintainer.pl\n - perl/Git: remove now useless email-address parsing code\n - send-email: add and use a local copy of Mail::Address\n\n Instead of maintaining home-grown email address parsing code, ship\n a copy of reasonably recent Mail::Address to be used as a fallback\n in 'git send-email' when the platform lacks it.\n\n Will merge to 'next'.\n\n\n* sb/submodule-update-reset-fix (2018-01-05) 4 commits\n - submodule: submodule_move_head omits old argument in forced case\n - unpack-trees: oneway_merge to update submodules\n - t/lib-submodule-update.sh: fix test ignoring ignored files in submodules\n - t/lib-submodule-update.sh: clarify test\n\n When resetting the working tree files recursively, the working tree\n of submodules are now also reset to match.\n\n Will merge to 'next'.\n\n\n* js/fix-merge-arg-quoting-in-rebase-p (2018-01-05) 1 commit\n  (merged to 'next' on 2018-01-09 at 57950f1843)\n + rebase -p: fix quoting when calling `git merge`\n\n \"git rebase -p -X<option>\" did not propagate the option properly\n down to underlying merge strategy backend.\n\n Will merge to 'master'.\n\n\n* as/read-tree-prefix-doc-fix (2018-01-09) 1 commit\n - doc/read-tree: remove obsolete remark\n\n Doc update.\n\n Will merge to 'next'.\n\n\n* jh/object-filtering (2018-01-08) 1 commit\n - oidset: don't return value from oidset_init\n\n Hotfix for a topic already in 'master'.\n\n Will merge to 'next'.\n\n\n* pc/submodule-helper (2018-01-09) 2 commits\n - submodule: port submodule subcommand 'deinit' from shell to C\n - submodule: port submodule subcommand 'sync' from shell to C\n\n Rewrite two more \"git submodule\" subcommands in C.\n\n Will segfault.\n cf. <xmqqpo6i4uns.fsf@gitster.mtv.corp.google.com>\n\n\n* sb/blame-color (2018-01-08) 4 commits\n - builtin/blame: highlight recently changed lines\n - builtin/blame: add option to color metadata fields separately\n - builtin/blame: dim uninteresting metadata\n - color.h: document and modernize header\n\n\n* sg/travis-build-during-script-phase (2018-01-08) 1 commit\n - travis-ci: build Git during the 'script' phase\n\n Still under discussion.\n cf. <5DE3FA05-2347-4BE7-8A1A-A6E5FEEC7C2B@gmail.com>\n\n\n* tg/stash-with-pathspec-fix (2018-01-08) 1 commit\n - stash: don't delete untracked files that match pathspec\n\n \"git stash -- <pathspec>\" incorrectly blew away untracked files in\n the directory that matched the pathspec, which has been corrected.\n\n Will merge to 'next'.\n\n\n* ys/bisect-object-id-missing-conversion-fix (2018-01-09) 1 commit\n - bisect: debug: convert struct object to object_id\n\n Fix for a commented-out code to adjust it to a rather old API change.\n\n Will merge to 'next'.\n\n--------------------------------------------------\n[Stalled]\n\n* pb/bisect-helper-2 (2017-10-28) 8 commits\n - t6030: make various test to pass GETTEXT_POISON tests\n - bisect--helper: `bisect_start` shell function partially in C\n - bisect--helper: `get_terms` & `bisect_terms` shell function in C\n - bisect--helper: `bisect_next_check` shell function in C\n - bisect--helper: `check_and_set_terms` shell function in C\n - wrapper: move is_empty_file() and rename it as is_empty_or_missing_file()\n - bisect--helper: `bisect_write` shell function in C\n - bisect--helper: `bisect_reset` shell function in C\n\n Expecting a reroll.\n cf. <0102015f5e5ee171-f30f4868-886f-47a1-a4e4-b4936afc545d-000000@eu-west-1.amazonses.com>\n\n\n* dj/runtime-prefix (2017-12-05) 4 commits\n . exec_cmd: RUNTIME_PREFIX on some POSIX systems\n . Makefile: add Perl runtime prefix support\n . Makefile: add support for \"perllibdir\"\n . Makefile: generate Perl header from template file\n\n A build-time option has been added to allow Git to be told to refer\n to its associated files relative to the main binary, in the same\n way that has been possible on Windows for quite some time, for\n Linux, BSDs and Darwin.\n\n Tentatively kicked out of 'next' to see how well another topic\n ab/simplify-perl-makefile that heavily conflicts with this fares.\n\n\n* mk/http-backend-content-length (2017-11-27) 4 commits\n - SQUASH???\n - t5560-http-backend-noserver.sh: add CONTENT_LENGTH cases\n - SQUASH???\n - http-backend: respect CONTENT_LENGTH as specified by rfc3875\n\n The http-backend (used for smart-http transport) used to slurp the\n whole input until EOF, without paying attention to CONTENT_LENGTH\n that is supplied in the environment and instead expecting the Web\n server to close the input stream.  This has been fixed.\n\n Expecting a reroll.\n Suggested fixes to be used when rerolling is queued, but I'd\n prefer _not_ squashing them myself.\n\n Also, it may be too complex solution for the problem.\n cf. <20171204171308.GA13332@sigill.intra.peff.net>\n\n\n* cc/require-tcl-tk-for-build (2017-11-29) 2 commits\n - travis-ci: avoid new tcl/tk build requirement\n - Makefile: check that tcl/tk is installed\n\n A first-time builder of Git may have installed neither tclsh nor\n msgfmt, in which case git-gui and gitk part will fail and break the\n build.  As a workaround, refuse to run a build when tclsh is not\n installed and NO_TCLTK is not set.\n\n Undecided.\n I still feel that requring tclsh to be installed, with or without\n \"escape hatch\" for experts, may be too heavy-handed.\n\n\n* mg/merge-base-fork-point (2017-09-17) 3 commits\n - merge-base: find fork-point outside partial reflog\n - merge-base: return fork-point outside reflog\n - t6010: test actual test output\n\n \"merge-base --fork-point $branch $commit\" is used to guess on which\n commit among the commits that were once at the tip of the $branch the\n $commit was built on top of, and it learns these historical tips from\n the reflog of the $branch.  When the true fork-point is lost due to\n pruning of old reflog entries, the command does not give any output,\n because it has no way to guess correctly and does not want to mislead\n the user with a wrong guess.\n\n The command has been updated to give the best but not known to be\n correct guess, based on a hope that a merge-base between $commit and a\n virtual merge across all the reflog entries that still are available\n for $branch may still be a closer to the true fork-point than the\n merge-base between $commit and the current tip of the $branch.\n\n This may have to be offered by an additional option, to allow the\n users that are prepared to see a potentially incorrect guess to opt\n into the feature, without affecting the current callers that may not\n be prepared to accept a guess that is not known to be correct.\n\n What's the doneness of this one?\n\n\n* jk/drop-ancient-curl (2017-08-09) 5 commits\n - http: #error on too-old curl\n - curl: remove ifdef'd code never used with curl >=7.19.4\n - http: drop support for curl < 7.19.4\n - http: drop support for curl < 7.16.0\n - http: drop support for curl < 7.11.1\n\n Some code in http.c that has bitrot is being removed.\n\n Expecting a reroll.\n\n\n* mk/use-size-t-in-zlib (2017-08-10) 1 commit\n . zlib.c: use size_t for size\n\n The wrapper to call into zlib followed our long tradition to use\n \"unsigned long\" for sizes of regions in memory, which have been\n updated to use \"size_t\".\n\n Needs resurrecting by making sure the fix is good and still applies\n (or adjusted to today's codebase).\n\n\n* mg/status-in-progress-info (2017-05-10) 2 commits\n - status --short --inprogress: spell it as --in-progress\n - status: show in-progress info for short status\n\n \"git status\" learns an option to report various operations\n (e.g. \"merging\") that the user is in the middle of.\n\n cf. <xmqqmvakcdqw.fsf@gitster.mtv.corp.google.com>\n\n\n* nd/worktree-move (2017-04-20) 6 commits\n - worktree remove: new command\n - worktree move: refuse to move worktrees with submodules\n - worktree move: accept destination as directory\n - worktree move: new command\n - worktree.c: add update_worktree_location()\n - worktree.c: add validate_worktree()\n\n \"git worktree\" learned move and remove subcommands.\n\n Expecting a reroll.\n cf. <20170420101024.7593-1-pclouds@gmail.com>\n cf. <20170421145916.mknekgqzhxffu7di@sigill.intra.peff.net>\n cf. <d0e81b1e-5869-299e-f462-4d43dc997bd1@ramsayjones.plus.com>\n\n--------------------------------------------------\n[Cooking]\n\n* ew/empty-merge-with-dirty-index (2018-01-09) 1 commit\n  (merged to 'next' on 2018-01-09 at 851bc45d06)\n + Merge branch 'ew/empty-merge-with-dirty-index-maint' into ew/empty-merge-with-dirty-index\n (this branch uses ew/empty-merge-with-dirty-index-maint.)\n\n \"git merge -s recursive\" did not correctly abort when the index is\n dirty, if the merged tree happened to be the same as the current\n HEAD, which has been fixed.\n\n Will merge to 'master'.\n\n\n* ew/empty-merge-with-dirty-index-maint (2018-01-09) 1 commit\n + merge-recursive: do not look at the index during recursive merge\n (this branch is used by ew/empty-merge-with-dirty-index.)\n\n \"git merge -s recursive\" did not correctly abort when the index is\n dirty, if the merged tree happened to be the same as the current\n HEAD, which has been fixed.\n\n Will merge to 'master' (as part of the above).\n\n\n* jc/merge-symlink-ours-theirs (2018-01-03) 1 commit\n  (merged to 'next' on 2018-01-05 at 63ebfc45eb)\n + merge: teach -Xours/-Xtheirs to symbolic link merge\n\n \"git merge -Xours/-Xtheirs\" learned to use our/their version when\n resolving a conflicting updates to a symbolic link.\n\n Will cook in 'next'.\n\n\n* ab/commit-m-with-fixup (2017-12-22) 2 commits\n - commit: add support for --fixup <commit> -m\"<extra message>\"\n - commit doc: document that -c, -C, -F and --fixup with -m error\n\n \"git commit --fixup\" did not allow \"-m<message>\" option to be used\n at the same time; allow it to annotate resulting commit with more\n text.\n\n Will merge to 'next'.\n\n\n* bw/oidmap-autoinit (2017-12-27) 1 commit\n - oidmap: ensure map is initialized\n\n Code clean-up.\n\n Will merge to 'next'.\n\n\n* dk/describe-all-output-fix (2017-12-27) 1 commit\n  (merged to 'next' on 2017-12-28 at c6254494e3)\n + describe: prepend \"tags/\" when describing tags with embedded name\n\n An old regression in \"git describe --all $annotated_tag^0\" has been\n fixed.\n\n Will cook in 'next'.\n\n\n* nd/fix-untracked-cache-invalidation (2018-01-04) 5 commits\n - dir.c: stop ignoring opendir() error in open_cached_dir()\n - update-index doc: note a fixed bug in the untracked cache\n - dir.c: fix missing dir invalidation in untracked code\n - dir.c: avoid stat() in valid_cached_dir()\n - status: add a failing test showing a core.untrackedCache bug\n\n Some bugs around \"untracked cache\" feature have been fixed.\n\n Will merge to 'next'.\n\n\n* nd/ita-wt-renames-in-status (2017-12-27) 6 commits\n  (merged to 'next' on 2017-12-28 at 7610331a11)\n + wt-status.c: handle worktree renames\n + wt-status.c: rename rename-related fields in wt_status_change_data\n + wt-status.c: catch unhandled diff status codes\n + wt-status.c: coding style fix\n + Use DIFF_DETECT_RENAME for detect_rename assignments\n + t2203: test status output with porcelain v2 format\n\n \"git status\" after moving a path in the working tree (hence making\n it appear \"removed\") and then adding with the -N option (hence\n making that appear \"added\") detected it as a rename, but did not\n report the  old and new pathnames correctly.\n\n Will cook in 'next'.\n\n\n* np/send-email-header-parsing (2017-12-15) 1 commit\n - send-email: extract email-parsing code into a subroutine\n\n Code refactoring.\n\n Undecided.\n\n\n* av/fsmonitor-updates (2018-01-04) 6 commits\n - fsmonitor: use fsmonitor data in `git diff`\n - fsmonitor: remove debugging lines from t/t7519-status-fsmonitor.sh\n - fsmonitor: make output of test-dump-fsmonitor more concise\n - fsmonitor: update helper tool, now that flags are filled later\n - fsmonitor: stop inline'ing mark_fsmonitor_valid / _invalid\n - dir.c: update comments to match argument name\n\n Code clean-up on fsmonitor integration, plus optional utilization\n of the fsmonitor data in diff-files.\n\n Undecided.\n cf. <alpine.DEB.2.21.1.1801042335130.32@MININT-6BKU6QN.europe.corp.microsoft.com>\n\n\n* ab/sha1dc-build (2017-12-12) 4 commits\n - Makefile: use the sha1collisiondetection submodule by default\n - sha1dc_git.h: re-arrange an ifdef chain for a subsequent change\n - Makefile: under \"make dist\", include the sha1collisiondetection submodule\n - Makefile: don't error out under DC_SHA1_EXTERNAL if DC_SHA1_SUBMODULE=auto\n\n Push the submodule version of collision-detecting SHA-1 hash\n implementation a bit harder on builders.\n\n The earlier two may make sense, but leaning toward rejecting the last step.\n cf. <xmqqk1xw6c24.fsf@gitster.mtv.corp.google.com>\n\n\n* ab/simplify-perl-makefile (2018-01-03) 3 commits\n  (merged to 'next' on 2018-01-03 at ecd1f51af2)\n + perl: treat PERLLIB_EXTRA as an extra path again\n  (merged to 'next' on 2017-12-28 at d189d91ec6)\n + perl: avoid *.pmc and fix Error.pm further\n  (merged to 'next' on 2017-12-13 at 1b791d2503)\n + Makefile: replace perl/Makefile.PL with simple make rules\n\n The build procedure for perl/ part has been greatly simplified by\n weaning ourselves off of MakeMaker.\n\n Will cook in 'next'.\n\n\n* en/rename-directory-detection (2017-12-13) 35 commits\n - SQUASH???\n - merge-recursive: ensure we write updates for directory-renamed file\n - merge-recursive: avoid spurious rename/rename conflict from dir renames\n - directory rename detection: new testcases showcasing a pair of bugs\n - merge-recursive: fix remaining directory rename + dirty overwrite cases\n - merge-recursive: fix overwriting dirty files involved in renames\n - merge-recursive: avoid clobbering untracked files with directory renames\n - merge-recursive: apply necessary modifications for directory renames\n - merge-recursive: when comparing files, don't include trees\n - merge-recursive: check for file level conflicts then get new name\n - merge-recursive: add computation of collisions due to dir rename & merging\n - merge-recursive: add a new hashmap for storing file collisions\n - merge-recursive: check for directory level conflicts\n - merge-recursive: add get_directory_renames()\n - merge-recursive: make a helper function for cleanup for handle_renames\n - merge-recursive: add a new hashmap for storing directory renames\n - merge-recursive: split out code for determining diff_filepairs\n - merge-recursive: make !o->detect_rename codepath more obvious\n - merge-recursive: fix leaks of allocated renames and diff_filepairs\n - merge-recursive: introduce new functions to handle rename logic\n - merge-recursive: move the get_renames() function\n - directory rename detection: tests for handling overwriting dirty files\n - directory rename detection: tests for handling overwriting untracked files\n - directory rename detection: miscellaneous testcases to complete coverage\n - directory rename detection: testcases exploring possibly suboptimal merges\n - directory rename detection: more involved edge/corner testcases\n - directory rename detection: testcases checking which side did the rename\n - directory rename detection: files/directories in the way of some renames\n - directory rename detection: partially renamed directory testcase/discussion\n - directory rename detection: testcases to avoid taking detection too far\n - directory rename detection: directory splitting testcases\n - directory rename detection: basic testcases\n - merge-recursive: add explanation for src_entry and dst_entry\n - merge-recursive: fix logic ordering issue\n - Tighten and correct a few testcases for merging and cherry-picking\n\n Rename detection logic in \"diff\" family that is used in \"merge\" has\n learned to guess when all of x/a, x/b and x/c have moved to z/a,\n z/b and z/c, it is likely that x/d added in the meantime would also\n want to move to z/d by taking the hint that the entire directory\n 'x' moved to 'z'.\n\n A rerolled version exists; it needs to be picked up.\n\n\n* pw/sequencer-in-process-commit (2017-12-22) 11 commits\n  (merged to 'next' on 2017-12-28 at c496b3fa29)\n + sequencer: assign only free()able strings to gpg_sign\n  (merged to 'next' on 2017-12-13 at ec4d2b9c84)\n + sequencer: improve config handling\n  (merged to 'next' on 2017-12-06 at a4212f7ebd)\n + t3512/t3513: remove KNOWN_FAILURE_CHERRY_PICK_SEES_EMPTY_COMMIT=1\n + sequencer: try to commit without forking 'git commit'\n + sequencer: load commit related config\n + sequencer: simplify adding Signed-off-by: trailer\n + commit: move print_commit_summary() to libgit\n + commit: move post-rewrite code to libgit\n + Add a function to update HEAD after creating a commit\n + commit: move empty message checks to libgit\n + t3404: check intermediate squash messages\n\n The sequencer infrastructure is shared across \"git cherry-pick\",\n \"git rebase -i\", etc., and has always spawned \"git commit\" when it\n needs to create a commit.  It has been taught to do so internally,\n when able, by reusing the codepath \"git commit\" itself uses, which\n gives performance boost for a few tens of percents in some sample\n scenarios.\n\n Will cook in 'next'.\n\n\n* jh/fsck-promisors (2017-12-08) 10 commits\n - gc: do not repack promisor packfiles\n - rev-list: support termination at promisor objects\n - sha1_file: support lazily fetching missing objects\n - introduce fetch-object: fetch one promisor object\n - index-pack: refactor writing of .keep files\n - fsck: support promisor objects as CLI argument\n - fsck: support referenced promisor objects\n - fsck: support refs pointing to promisor objects\n - fsck: introduce partialclone extension\n - extension.partialclone: introduce partial clone extension\n (this branch is used by jh/partial-clone.)\n\n In preparation for implementing narrow/partial clone, the machinery\n for checking object connectivity used by gc and fsck has been\n taught that a missing object is OK when it is referenced by a\n packfile specially marked as coming from trusted repository that\n promises to make them available on-demand and lazily.\n\n\n* jh/partial-clone (2017-12-08) 13 commits\n - t5616: test bulk prefetch after partial fetch\n - fetch: inherit filter-spec from partial clone\n - t5616: end-to-end tests for partial clone\n - fetch-pack: restore save_commit_buffer after use\n - unpack-trees: batch fetching of missing blobs\n - clone: partial clone\n - partial-clone: define partial clone settings in config\n - fetch: support filters\n - fetch: refactor calculation of remote list\n - fetch-pack: test support excluding large blobs\n - fetch-pack: add --no-filter\n - fetch-pack, index-pack, transport: partial clone\n - upload-pack: add object filtering for partial clone\n (this branch uses jh/fsck-promisors.)\n\n The machinery to clone & fetch, which in turn involves packing and\n unpacking objects, have been told how to omit certain objects using\n the filtering mechanism introduced by the jh/object-filtering\n topic, and also mark the resulting pack as a promisor pack to\n tolerate missing objects, taking advantage of the mechanism\n introduced by the jh/fsck-promisors topic.\n\n\n* ot/mru-on-list (2017-10-01) 1 commit\n - mru: use double-linked list from list.h\n\n The first step to getting rid of mru API and using the\n doubly-linked list API directly instead.\n\n Is there any remaining issues on this one?\n\n\n* jm/svn-pushmergeinfo-fix (2017-09-17) 1 commit\n  (merged to 'next' on 2018-01-05 at 6cb237ea44)\n + git-svn: fix svn.pushmergeinfo handling of svn+ssh usernames.\n\n \"git svn dcommit\" did not take into account the fact that a\n svn+ssh:// URL with a username@ (typically used for pushing) refers\n to the same SVN repository without the username@ and failed when\n svn.pushmergeinfo option is set.\n\n Will cook in 'next'.\n\n--------------------------------------------------\n[Discarded]\n\n* rs/revision-keep-pending (2017-12-19) 1 commit\n  (merged to 'next' on 2017-12-27 at 20a9527941)\n + revision: introduce prepare_revision_walk_extended()\n\n Reverted out of 'next' to give a chance to its reworked successor,\n queued on the rs/lose-leak-pending topic.\n\n\n* sb/diff-blobfind (2017-12-12) 1 commit\n  (merged to 'next' on 2017-12-13 at 9a27a20c5f)\n + diffcore: add a filter to find a specific blob\n\n \"git diff\" family of commands learned --blobfind=<object-name> that\n allows you to limit the output only to a change that involves the\n named blob object (either changing the contents from or to it).\n\n Reverted out of 'next' to give a chance to its reworked successor,\n queued on the sb/diff-blobfind-pickaxe topic.\n"},{"id":"336344","messageId":"87vaga9mgf.fsf@evledraar.gmail.com","threadId":"47581","inReplyTo":"xmqqa7xm38wc.fsf@gitster.mtv.corp.google.com","subject":"Re: What's cooking in git.git (Jan 2018, #02; Tue, 9)","fromName":"Ævar Arnfjörð Bjarmason","fromEmail":"avarab@gmail.com","sentAt":"2018-01-10T07:56:00Z","receivedAt":"2018-01-10T07:56:08Z","isPatch":false,"sender":{"key":"avarab@gmail.com","avatar":"https://avatars.githubusercontent.com/u/45301?v=4"},"body":"\nOn Tue, Jan 09 2018, Junio C. Hamano jotted:\n\n> * ab/wildmatch-tests (2018-01-04) 7 commits\n>   (merged to 'next' on 2018-01-09 at 09f0b84098)\n>  + wildmatch test: create & test files on disk in addition to in-memory\n>  + wildmatch test: perform all tests under all wildmatch() modes\n>  + wildmatch test: remove dead fnmatch() test code\n>  + wildmatch test: use a paranoia pattern from nul_match()\n>  + wildmatch test: don't try to vertically align our output\n>  + wildmatch test: use more standard shell style\n>  + wildmatch test: indent with tabs, not spaces\n>\n>  More tests for wildmatch functions.\n>\n>  Will cook in 'next'.\n\nPlease don't merge it down for now. I've got a WIP resubmission of this\nwhich rewrites most of the later part of the series & addresses various\nissues raised.\n\n> * ab/perf-grep-threads (2018-01-04) 1 commit\n>   (merged to 'next' on 2018-01-09 at 8fe1d71894)\n>  + perf: amend the grep tests to test grep.threads\n>\n>  More perf tests for threaded grep\n>\n>  Will cook in 'next'.\n\nRe: the concern raised in xmqqa7xsaqki.fsf@gitster.mtv.corp.google.com I\nthink it makes sense to just document (and I can do that if you agree)\nthat:\n\n    test_expect_success SOME_PREREQ,$SOME_OTHER_PREREQ,$ANOTHER_ONE [...]\n\nWill work as far as prereqs goes even though the variables might be\nempty. It's much less verbose than the proposed alternative, and easy to\nsupport.\n\n>  Will [cook in|merge to] 'next'.\n\nRefresh my memory, that means merge down post-2.16.0 at this point,\nright?\n"},{"id":"336389","messageId":"718e2723-9547-8cd6-ac46-07e8631da09a@jeffhostetler.com","threadId":"47581","inReplyTo":"xmqqa7xm38wc.fsf@gitster.mtv.corp.google.com","subject":"Re: What's cooking in git.git (Jan 2018, #02; Tue, 9)","fromName":"Jeff Hostetler","fromEmail":"git@jeffhostetler.com","sentAt":"2018-01-10T16:25:42Z","receivedAt":"2018-01-10T16:25:54Z","isPatch":false,"sender":{"key":"git@jeffhostetler.com","avatar":null},"body":"\n\nOn 1/9/2018 6:33 PM, Junio C Hamano wrote:\n> --------------------------------------------------\n> [Cooking]\n> \n> \n> * jh/fsck-promisors (2017-12-08) 10 commits\n[...]\n\n> * jh/partial-clone (2017-12-08) 13 commits\n[...]\n\nParts 2 and 3 of partial clone have been simmering\nfor a while now.  I was wondering if there were any\nmore comments or questions on them.  I don't recall\nany existing issues.\n\nThanks\nJeff\n\n\n\n"},{"id":"336415","messageId":"xmqqshbd1o8a.fsf@gitster.mtv.corp.google.com","threadId":"47581","inReplyTo":"718e2723-9547-8cd6-ac46-07e8631da09a@jeffhostetler.com","subject":"Re: What's cooking in git.git (Jan 2018, #02; Tue, 9)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2018-01-10T19:57:09Z","receivedAt":"2018-01-10T19:57:15Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Jeff Hostetler <git@jeffhostetler.com> writes:\n\n> On 1/9/2018 6:33 PM, Junio C Hamano wrote:\n>> --------------------------------------------------\n>> [Cooking]\n>>\n>>\n>> * jh/fsck-promisors (2017-12-08) 10 commits\n> [...]\n>\n>> * jh/partial-clone (2017-12-08) 13 commits\n> [...]\n>\n> Parts 2 and 3 of partial clone have been simmering\n> for a while now.  I was wondering if there were any\n> more comments or questions on them.  I don't recall\n> any existing issues.\n\nMe neither.\n\nI do not mind merging them to 'next' during the feature freeze, but\nwe won't be merging them to 'master' soon anyway, and I'd like to\nsee us concentrate more on finding and fixing regressions on the\n'master' front for now.\n"},{"id":"336416","messageId":"xmqqo9m11nyt.fsf@gitster.mtv.corp.google.com","threadId":"47581","inReplyTo":"87vaga9mgf.fsf@evledraar.gmail.com","subject":"Re: What's cooking in git.git (Jan 2018, #02; Tue, 9)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2018-01-10T20:02:50Z","receivedAt":"2018-01-10T20:02:57Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Ævar Arnfjörð Bjarmason <avarab@gmail.com> writes:\n\n> On Tue, Jan 09 2018, Junio C. Hamano jotted:\n>\n>> * ab/wildmatch-tests (2018-01-04) 7 commits\n>>   (merged to 'next' on 2018-01-09 at 09f0b84098)\n>>  + wildmatch test: create & test files on disk in addition to in-memory\n>>  + wildmatch test: perform all tests under all wildmatch() modes\n>>  + wildmatch test: remove dead fnmatch() test code\n>>  + wildmatch test: use a paranoia pattern from nul_match()\n>>  + wildmatch test: don't try to vertically align our output\n>>  + wildmatch test: use more standard shell style\n>>  + wildmatch test: indent with tabs, not spaces\n>>\n>>  More tests for wildmatch functions.\n>>\n>>  Will cook in 'next'.\n>\n> Please don't merge it down for now.\n\nOops, the above entry in the \"What's cooking\" report is totally\nbogus.  It is not merged to 'next' yet, and 09f0b84098 does not\nexist in the public history of the project.\n\nWhat happened was that I rewound 'next' after making a trial merge\nbefore pushing the result out.  I updated the \"What's cooking\" report\nwhile the trial merge was in 'next', which I should have redone.\n\n>> * ab/perf-grep-threads (2018-01-04) 1 commit\n>>   (merged to 'next' on 2018-01-09 at 8fe1d71894)\n>>  + perf: amend the grep tests to test grep.threads\n>>\n>>  More perf tests for threaded grep\n>>\n>>  Will cook in 'next'.\n>\n> Re: the concern raised in xmqqa7xsaqki.fsf@gitster.mtv.corp.google.com I\n> think it makes sense to just document (and I can do that if you agree)\n> that:\n>\n>     test_expect_success SOME_PREREQ,$SOME_OTHER_PREREQ,$ANOTHER_ONE [...]\n>\n> Will work as far as prereqs goes even though the variables might be\n> empty. It's much less verbose than the proposed alternative, and easy to\n> support.\n\nOK.\n\n>>  Will [cook in|merge to] 'next'.\n>\n> Refresh my memory, that means merge down post-2.16.0 at this point,\n> right?\n\nAfter -rc1, anything merged to 'next' will by default stay there\nuntil the final.  Hotfixes will be merged to 'next' and (unless I\nforget) will be marked as \"will merge to 'master'\" when that\nhappens, so that we will have them in the final.\n"},{"id":"336430","messageId":"bda13f22-b6ca-f46d-9730-ff00ec536b0b@jeffhostetler.com","threadId":"47581","inReplyTo":"xmqqshbd1o8a.fsf@gitster.mtv.corp.google.com","subject":"Re: What's cooking in git.git (Jan 2018, #02; Tue, 9)","fromName":"Jeff Hostetler","fromEmail":"git@jeffhostetler.com","sentAt":"2018-01-10T22:03:37Z","receivedAt":"2018-01-10T22:03:46Z","isPatch":false,"sender":{"key":"git@jeffhostetler.com","avatar":null},"body":"\n\nOn 1/10/2018 2:57 PM, Junio C Hamano wrote:\n> Jeff Hostetler <git@jeffhostetler.com> writes:\n> \n>> On 1/9/2018 6:33 PM, Junio C Hamano wrote:\n>>> --------------------------------------------------\n>>> [Cooking]\n>>>\n>>>\n>>> * jh/fsck-promisors (2017-12-08) 10 commits\n>> [...]\n>>\n>>> * jh/partial-clone (2017-12-08) 13 commits\n>> [...]\n>>\n>> Parts 2 and 3 of partial clone have been simmering\n>> for a while now.  I was wondering if there were any\n>> more comments or questions on them.  I don't recall\n>> any existing issues.\n> \n> Me neither.\n> \n> I do not mind merging them to 'next' during the feature freeze, but\n> we won't be merging them to 'master' soon anyway, and I'd like to\n> see us concentrate more on finding and fixing regressions on the\n> 'master' front for now.\n\nI didn't want to rush this -- just check to see if there was\nany thing that I should focus on while waiting for 2.16 to ship\nand settle down.\n\nLeave this where it is now if you want and we can merge it in later.\n\nThanks\nJeff\n\n  \n"},{"id":"336753","messageId":"CAP8UFD0P7kVo2NP4Wq7OaSV4H1+sqHapuzW5AQef+enNS0S5hw@mail.gmail.com","threadId":"47581","inReplyTo":"bda13f22-b6ca-f46d-9730-ff00ec536b0b@jeffhostetler.com","subject":"Re: What's cooking in git.git (Jan 2018, #02; Tue, 9)","fromName":"Christian Couder","fromEmail":"christian.couder@gmail.com","sentAt":"2018-01-18T08:56:50Z","receivedAt":"2018-01-18T08:56:59Z","isPatch":false,"sender":{"key":"christian.couder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/208954?v=4"},"body":"On Wed, Jan 10, 2018 at 11:03 PM, Jeff Hostetler <git@jeffhostetler.com> wrote:\n>\n>\n> On 1/10/2018 2:57 PM, Junio C Hamano wrote:\n>>\n>> Jeff Hostetler <git@jeffhostetler.com> writes:\n>>\n>>> On 1/9/2018 6:33 PM, Junio C Hamano wrote:\n>>>>\n>>>> --------------------------------------------------\n>>>> [Cooking]\n>>>>\n>>>>\n>>>> * jh/fsck-promisors (2017-12-08) 10 commits\n>>>\n>>> [...]\n>>>\n>>>> * jh/partial-clone (2017-12-08) 13 commits\n>>>\n>>> [...]\n>>>\n>>> Parts 2 and 3 of partial clone have been simmering\n>>> for a while now.  I was wondering if there were any\n>>> more comments or questions on them.  I don't recall\n>>> any existing issues.\n>>\n>> Me neither.\n\nI am still not very happy with fetch_object() not returning anything.\nI wonder what happens when that function is used to fetch from a repo\nthat cannot provide the requested object.\n\nAlso I think the \"extensions.partialclone = <remote>\" config option is\nnot very future proof. If people start using partial clone, it is\nlikely that at some point they will need their repo to talk to more\nthan one remote that is partial clone enabled and I don't see how such\na config option can scale in this case.\n\n>> I do not mind merging them to 'next' during the feature freeze, but\n>> we won't be merging them to 'master' soon anyway, and I'd like to\n>> see us concentrate more on finding and fixing regressions on the\n>> 'master' front for now.\n>\n> I didn't want to rush this -- just check to see if there was\n> any thing that I should focus on while waiting for 2.16 to ship\n> and settle down.\n\nThanks for already having commented on the patch series I sent to\nintegrate the external odb with the above work,\nChristian.\n"},{"id":"336841","messageId":"20180118143109.bc0eb10b036411e0a5a3694f@google.com","threadId":"47581","inReplyTo":"CAP8UFD0P7kVo2NP4Wq7OaSV4H1+sqHapuzW5AQef+enNS0S5hw@mail.gmail.com","subject":"Re: What's cooking in git.git (Jan 2018, #02; Tue, 9)","fromName":"Jonathan Tan","fromEmail":"jonathantanmy@google.com","sentAt":"2018-01-18T22:31:09Z","receivedAt":"2018-01-18T22:31:25Z","isPatch":false,"sender":{"key":"jonathantanmy@fastmail.com","avatar":null},"body":"On Thu, 18 Jan 2018 09:56:50 +0100\nChristian Couder <christian.couder@gmail.com> wrote:\n\n> I am still not very happy with fetch_object() not returning anything.\n> I wonder what happens when that function is used to fetch from a repo\n> that cannot provide the requested object.\n\nMy idea was to save a verification step - the caller of fetch_object()\nneeds to reattempt the object load anyway (which includes a verification\nthat the object exists), so I didn't see the need to have fetch_object()\ndo it too.\n\n> Also I think the \"extensions.partialclone = <remote>\" config option is\n> not very future proof. If people start using partial clone, it is\n> likely that at some point they will need their repo to talk to more\n> than one remote that is partial clone enabled and I don't see how such\n> a config option can scale in this case.\n\nIn the case that they want to talk to more than one\npartial-clone-enabled repo, I think that there still needs to be one\n\"default\" remote from which missing objects are fetched. I can think of\na few reasons for that - for example, (a) we need to support commands\nthat give a nonexistent-in-repo SHA-1 directly, and (b) existing Git\ncode relies on the ability to fetch an object given only its SHA-1. (a)\ncan be overcome by forbidding that (?) and (b) can be overcome by an\noverhaul of the object-fetching and object-using code, but I don't think\nboth (a) and (b) will occur anytime soon.\n"}]}