{"thread":{"id":"47040","subject":"What's cooking in git.git (Oct 2017, #06; Fri, 27)","startedAt":"2017-10-27T08:33:07Z","lastAt":"2017-11-08T00:21:25Z","messageCount":10,"participants":["Junio C Hamano","Stefan Beller","Kaartic Sivaraam","Johannes Schindelin"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"331146","messageId":"xmqq7evhc7nw.fsf@gitster.mtv.corp.google.com","threadId":"47040","inReplyTo":null,"subject":"What's cooking in git.git (Oct 2017, #06; Fri, 27)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2017-10-27T08:32:51Z","receivedAt":"2017-10-27T08:33:07Z","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\nThe topics that are cooking in 'next' that are not urgent fixes are\nclassified as \"Will cook in 'next'\", and will not graduate to\n'master' until the final.\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* mh/ref-locking-fix (2017-10-25) 2 commits\n  (merged to 'next' on 2017-10-26 at 1f1091ad64)\n + files_transaction_prepare(): fix handling of ref lock failure\n + t1404: add a bunch of tests of D/F conflicts\n\n Transactions to update multiple references that involves a deletion\n was quite broken in an error codepath and did not abort everything\n correctly.\n\n--------------------------------------------------\n[New Topics]\n\n* js/submodule-in-excluded (2017-10-26) 1 commit\n  (merged to 'next' on 2017-10-26 at 2a262e6a0b)\n + status: do not get confused by submodules in excluded directories\n\n \"git status --ignored -u\" did not stop at a working tree of a\n separate project that is embedded in an ignored directory and\n listed files in that other project, instead of just showing the\n directory itself as ignored.\n\n Will cook in 'next'.\n\n\n* ao/path-use-xmalloc (2017-10-25) 1 commit\n  (merged to 'next' on 2017-10-26 at 4cc04083fb)\n + path.c: use xmalloc() in add_to_trie()\n\n A possible oom error is now caught as a fatal error, instead of\n continuing and dereferencing NULL.\n\n Will merge to 'master'.\n\n\n* tb/complete-checkout (2017-10-25) 1 commit\n  (merged to 'next' on 2017-10-26 at beeaf5b00c)\n + completion: add remaining flags to checkout\n\n Command line completion (in contrib/) update.\n\n Will cook in 'next'.\n\n\n* jc/ignore-cr-at-eol (2017-10-26) 2 commits\n - diff: --ignore-cr-at-eol\n - xdiff: reassign xpparm_t.flags bits\n\n The \"diff\" family of commands learned to ignore differences in\n carriage return at the end of line.\n\n Just a lunch-time hack.\n Lacks tests, docs and proper log message.\n\n\n* sb/diff-color-moved-use-xdl-recmatch (2017-10-26) 2 commits\n  (merged to 'next' on 2017-10-26 at 6711f24498)\n + diff.c: get rid of duplicate implementation\n + xdiff-interface: export comparing and hashing strings\n (this branch uses jk/diff-color-moved-fix.)\n\n Instead of using custom line comparison and hashing functions to\n implement \"moved lines\" coloring in the diff output, use the pair\n of these functions from lower-layer xdiff/ code.\n\n Will cook in 'next'.\n\n\n* jh/dir-add-exclude-from-blob (2017-10-27) 1 commit\n - dir: allow exclusions from blob in addition to file\n\n The code to read exclusion list from a blob, which is used when the\n .gitignore file is outside a sparse checkout area, has been\n refactored so that other codepath can later use it to do the same\n outside the context of \"sparse checkout\".\n\n\n* mh/avoid-rewriting-packed-refs (2017-10-27) 2 commits\n - files-backend: don't rewrite the `packed-refs` file unnecessarily\n - t1409: check that `packed-refs` is not rewritten unnecessarily\n\n Recent update to the refs infrastructure implementation started\n rewriting packed-refs file more often than before; this has been\n optimized again for most trivial cases.\n\n\n* sb/rev-parse-show-superproject-root (2017-10-27) 1 commit\n  (merged to 'next' on 2017-10-27 at f9a0520cec)\n + docs: fix formatting of rev-parse's --show-superproject-working-tree\n\n Doc markup fix.\n\n Will merge to 'master'.\n\n\n* sg/rev-list-doc-reorder-fix (2017-10-27) 1 commit\n  (merged to 'next' on 2017-10-27 at caf49859d7)\n + rev-list-options.txt: use correct directional reference\n\n Doc flow fix.\n\n Will merge to 'master'.\n\n--------------------------------------------------\n[Stalled]\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* cc/git-packet-pm (2017-10-22) 6 commits\n - Git/Packet.pm: extract parts of t0021/rot13-filter.pl for reuse\n - t0021/rot13-filter: add capability functions\n - t0021/rot13-filter: add packet_initialize()\n - t0021/rot13-filter: improve error message\n - t0021/rot13-filter: improve 'if .. elsif .. else' style\n - t0021/rot13-filter: refactor packet reading functions\n\n Parts of a test to drive the long-running content filter interface\n has been split into its own module, hopefully to eventually become\n reusable.\n\n Expecting a reroll.\n The original unfortunately is quite broken in error detection\n cases to make the result sub-par as a standalone module before it\n gets fixed.\n\n\n* jk/diff-color-moved-fix (2017-10-21) 5 commits\n  (merged to 'next' on 2017-10-26 at eb580e4c8c)\n + diff: handle NULs in get_string_hash()\n + diff: fix whitespace-skipping with --color-moved\n + t4015: test the output of \"diff --color-moved -b\"\n + t4015: check \"negative\" case for \"-w --color-moved\"\n + t4015: refactor --color-moved whitespace test\n (this branch is used by sb/diff-color-moved-use-xdl-recmatch.)\n\n The experimental \"color moved lines differently in diff output\"\n feature was buggy around \"ignore whitespace changes\" edges, whihch\n has been corrected.\n\n Will cook in 'next'.\n Most of the fixes to the incorrectly implemented custom helpers\n will go away with sb/diff-color-moved-use-xdl-recmatch topic.\n\n\n* jk/misc-resolve-ref-unsafe-fixes (2017-10-21) 4 commits\n  (merged to 'next' on 2017-10-26 at c327b2ec2f)\n + worktree: handle broken symrefs in find_shared_symref()\n + log: handle broken HEAD in decoration check\n + remote: handle broken symrefs\n + test-ref-store: avoid passing NULL to printf\n\n Some codepaths did not check for errors when asking what branch the\n HEAD points at, which have been fixed.\n\n Will cook in 'next'.\n\n\n* ao/check-resolve-ref-unsafe-result (2017-10-21) 1 commit\n  (merged to 'next' on 2017-10-26 at 84302ab59a)\n + commit: check result of resolve_ref_unsafe\n\n \"git commit\", after making a commit, did not check for errors when\n asking on what branch it made the commit, which has been correted.\n\n Will cook in 'next'.\n\n\n* jm/status-ignored-files-list (2017-10-24) 4 commits\n  (merged to 'next' on 2017-10-26 at 5df1e2354f)\n + status: test ignored modes\n + status: document options to show matching ignored files\n + status: report matching ignored and normal untracked\n + status: add option to show ignored files differently\n\n The set of paths output from \"git status --ignored\" was tied\n closely with its \"--untracked=<mode>\" option, but now it can be\n controlled more flexibly.  Most notably, a directory that is\n ignored because it is listed to be ignored in the ignore/exclude\n mechanism can be handled differently from a directory that ends up\n to be ignored only because all files in it are ignored.\n\n Will cook in 'next'.\n\n\n* mp/push-pushoption-config (2017-10-24) 1 commit\n  (merged to 'next' on 2017-10-26 at 2c72164d12)\n + builtin/push.c: add push.pushOption config\n\n The \"--push-option=<string>\" option to \"git push\" now defaults to a\n list of strings configured via push.pushOption variable.\n\n Will cook in 'next'.\n\n\n* gc/gitweb-filetest-acl (2017-10-24) 1 commit\n  (merged to 'next' on 2017-10-26 at 5b490f53bf)\n + gitweb: use filetest to allow ACLs\n\n \"gitweb\" checks if a directory is searchable with Perl's \"-x\"\n operator, which can be enhanced by using \"filetest 'access'\"\n pragma, which now we do.\n\n Will cook in 'next'.\n\n\n* jr/ssh-wrappers (2017-10-24) 5 commits\n - ssh: 'simple' variant does not support --port\n - ssh: 'simple' variant does not support -4/-6\n - ssh: 'auto' variant to select between 'ssh' and 'simple'\n - connect: split ssh command line options into separate function\n - connect: split git:// setup into a separate function\n (this branch uses bw/protocol-v1.)\n\n The ssh-variant 'simple' introduced earlier broke existing\n installations by not passing --port/-4/-6 and not diagnosing an\n attempt to pass these as an error.  Instead, default to\n automatically detect how compatible the GIT_SSH/GIT_SSH_COMMAND is\n to OpenSSH convention and then error out an invocation to make it\n easier to diagnose connection errors.\n\n\n* tg/deprecate-stash-save (2017-10-27) 3 commits\n  (merged to 'next' on 2017-10-27 at 73b1edb73b)\n + stash: remove now superfluos help for \"stash push\"\n + stash: mark \"git stash save\" deprecated in the man page\n + stash: replace \"git stash save\" with \"git stash push\" in the documentation\n\n \"git stash save\" has been deprecated in favour of \"git stash push\".\n\n Will cook in 'next'.\n\n\n* jc/check-ref-format-oor (2017-10-18) 3 commits\n  (merged to 'next' on 2017-10-18 at 8b17566c80)\n + check-ref-format doc: --branch validates and expands <branch>\n + check-ref-format --branch: strip refs/heads/ using skip_prefix\n + check-ref-format --branch: do not expand @{...} outside repository\n\n \"git check-ref-format --branch @{-1}\" bit a \"BUG()\" when run\n outside a repository for obvious reasons; clarify the documentation\n and make sure we do not even try to expand the at-mark magic in\n such a case, but still call the validation logic for branch names.\n\n Will cook in 'next'.\n\n\n* kd/auto-col-with-pager-fix (2017-10-24) 2 commits\n  (merged to 'next' on 2017-10-24 at ef3ff0f14b)\n + column: do not include pager.c\n  (merged to 'next' on 2017-10-18 at fe89ff7e83)\n + column: show auto columns when pager is active\n\n \"auto\" as a value for the columnar output configuration ought to\n judge \"is the output consumed by humans?\" with the same criteria as\n \"auto\" for coloured output configuration, i.e. either the standard\n output stream is going to tty, or a pager is in use.  We forgot the\n latter, which has been fixed.\n\n Will cook in 'next'.\n\n\n* jc/t5601-copy-workaround (2017-10-17) 1 commit\n  (merged to 'next' on 2017-10-18 at ea1e133968)\n + t5601: rm the target file of cp that could still be executing\n\n A (possibly flakey) test fix.\n\n Will cook in 'next'.\n\n\n* np/config-path-doc (2017-10-19) 1 commit\n  (merged to 'next' on 2017-10-26 at c17a3daafc)\n + config doc: clarify \"git config --path\" example\n\n Doc update.\n\n Will merge to 'master'.\n\n\n* jc/branch-name-sanity (2017-10-14) 3 commits\n  (merged to 'next' on 2017-10-16 at 174646d1c3)\n + branch: forbid refs/heads/HEAD\n + branch: split validate_new_branchname() into two\n + branch: streamline \"attr_only\" handling in validate_new_branchname()\n\n \"git branch\" and \"git checkout -b\" are now forbidden from creating\n a branch whose name is \"HEAD\".\n\n Will cook in 'next'.\n\n\n* jk/revision-pruning-optim (2017-10-14) 1 commit\n  (merged to 'next' on 2017-10-16 at 2662baa21d)\n + revision: quit pruning diff more quickly when possible\n\n Pathspec-limited revision traversal was taught not to keep finding\n unneeded differences once it knows two trees are different inside\n given pathspec.\n\n Will cook in 'next'.\n\n\n* wk/pull-signoff (2017-10-13) 1 commit\n  (merged to 'next' on 2017-10-16 at 5e48f349d9)\n + pull: pass --signoff/--no-signoff to \"git merge\"\n\n \"git pull\" has been taught to accept \"--[no-]signoff\" option and\n pass it down to \"git merge\".\n\n Will cook in 'next'.\n\n\n* dm/run-command-ignored-hook-advise (2017-10-10) 1 commit\n  (merged to 'next' on 2017-10-10 at 0827814922)\n + run-command: add hint when a hook is ignored\n\n A hook script that is set unexecutable is simply ignored.  Git\n notifies when such a file is ignored, unless the message is\n squelched via advice.ignoredHook configuration.\n\n Will cook in 'next'.\n\n\n* hv/fetch-moved-submodules-on-demand (2017-10-17) 3 commits\n  (merged to 'next' on 2017-10-26 at c446ea3e9a)\n + submodule: simplify decision tree whether to or not to fetch\n + implement fetching of moved submodules\n + fetch: add test to make sure we stay backwards compatible\n\n \"git fetch --recurse-submodules\" now knows that submodules can be\n moved around in the superproject in addition to getting updated,\n and finds the ones that need to be fetched accordingly.\n\n Will cook in 'next'.\n\n\n* js/for-each-ref-remote-name-and-ref (2017-10-11) 3 commits\n - for-each-ref: test :remotename and :remoteref\n - for-each-ref: let upstream/push optionally report the remote ref name\n - for-each-ref: let upstream/push optionally report the remote name\n\n The \"--format=...\" option \"git for-each-ref\" takes learned to show\n the name of the 'remote' repository and the ref at the remote side\n that is affected for 'upstream' and 'push' via \"%(push:remotename)\"\n and friends.\n\n Needs a bit more work on the documentation part.\n\n\n* pb/bisect-helper (2017-10-06) 6 commits\n  (merged to 'next' on 2017-10-13 at ffc9aefe63)\n + bisect--helper: `is_expected_rev` & `check_expected_revs` shell function in C\n + t6030: explicitly test for bisection cleanup\n + bisect--helper: `bisect_clean_state` shell function in C\n + bisect--helper: `write_terms` shell function in C\n + bisect--helper: rewrite `check_term_format` shell function in C\n + bisect--helper: use OPT_CMDMODE instead of OPT_BOOL\n\n An early part of piece-by-piece rewrite of \"git bisect\".\n\n Will cook in 'next'.\n\n\n* bc/object-id (2017-10-16) 25 commits\n  (merged to 'next' on 2017-10-18 at ef8aa2698d)\n + refs/files-backend: convert static functions to object_id\n + refs: convert read_raw_ref backends to struct object_id\n + refs: convert peel_object to struct object_id\n + refs: convert resolve_ref_unsafe to struct object_id\n + worktree: convert struct worktree to object_id\n + refs: convert resolve_gitlink_ref to struct object_id\n + Convert remaining callers of resolve_gitlink_ref to object_id\n + sha1_file: convert index_path and index_fd to struct object_id\n + refs: convert reflog_expire parameter to struct object_id\n + refs: convert read_ref_at to struct object_id\n + refs: convert peel_ref to struct object_id\n + builtin/pack-objects: convert to struct object_id\n + pack-bitmap: convert traverse_bitmap_commit_list to object_id\n + refs: convert dwim_log to struct object_id\n + builtin/reflog: convert remaining unsigned char uses to object_id\n + refs: convert dwim_ref and expand_ref to struct object_id\n + refs: convert read_ref and read_ref_full to object_id\n + refs: convert resolve_refdup and refs_resolve_refdup to struct object_id\n + Convert check_connected to use struct object_id\n + refs: update ref transactions to use struct object_id\n + refs: prevent accidental NULL dereference in write_pseudoref\n + refs: convert update_ref and refs_update_ref to use struct object_id\n + refs: convert delete_ref and refs_delete_ref to struct object_id\n + refs/files-backend: convert struct ref_to_prune to object_id\n + walker: convert to struct object_id\n\n Conversion from uchar[20] to struct object_id continues.\n\n Will cook in 'next'.\n\n\n* jc/no-cmd-as-subroutine (2017-10-11) 2 commits\n  (merged to 'next' on 2017-10-16 at 5f4ee919ac)\n + merge-ours: do not use cmd_*() as a subroutine\n + describe: do not use cmd_*() as a subroutine\n\n Calling cmd_foo() as if it is a general purpose helper function is\n a no-no.  Correct two instances of such to set an example.\n\n Will cook in 'next'.\n\n\n* jc/merge-symlink-ours-theirs (2017-09-26) 1 commit\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 Needs review.\n\n\n* jt/partial-clone-lazy-fetch (2017-10-02) 18 commits\n - fetch-pack: restore save_commit_buffer after use\n - unpack-trees: batch fetching of missing blobs\n - clone: configure blobmaxbytes in created repos\n - clone: support excluding large blobs\n - fetch: support excluding large blobs\n - fetch: refactor calculation of remote list\n - fetch-pack: support excluding large blobs\n - pack-objects: support --blob-max-bytes\n - pack-objects: rename want_.* to ignore_.*\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\n A journey for \"git clone\" and \"git fetch\" to become \"lazier\" by\n depending more on its remote repository---this is the beginning of\n it.\n\n Expecting a reroll.\n cf. <CAGf8dgLu-TeK8KbHv-U+18O+L2TxKcGv5vFFHy38J6a_YXRfew@mail.gmail.com>\n\n\n* ma/lockfile-fixes (2017-10-07) 12 commits\n  (merged to 'next' on 2017-10-16 at 19fae5c138)\n + read_cache: roll back lock in `update_index_if_able()`\n + read-cache: leave lock in right state in `write_locked_index()`\n + read-cache: drop explicit `CLOSE_LOCK`-flag\n + cache.h: document `write_locked_index()`\n + apply: remove `newfd` from `struct apply_state`\n + apply: move lockfile into `apply_state`\n + cache-tree: simplify locking logic\n + checkout-index: simplify locking logic\n + tempfile: fix documentation on `delete_tempfile()`\n + lockfile: fix documentation on `close_lock_file_gently()`\n + treewide: prefer lockfiles on the stack\n + sha1_file: do not leak `lock_file`\n\n An earlier update made it possible to use an on-stack in-core\n lockfile structure (as opposed to having to deliberately leak an\n on-heap one).  Many codepaths have been updated to take advantage\n of this new facility.\n\n Will cook in 'next'.\n\n\n* ot/mru-on-list (2017-10-01) 1 commit\n  (merged to 'next' on 2017-10-07 at e6ad4a16a2)\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 Will cook in 'next'.\n\n\n* jm/svn-pushmergeinfo-fix (2017-09-17) 1 commit\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 Needs a test, perhaps as a follow-up patch.\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* ds/find-unique-abbrev-optim (2017-10-13) 4 commits\n  (merged to 'next' on 2017-10-16 at 7f4479ac52)\n + sha1_name: minimize OID comparisons during disambiguation\n + sha1_name: parse less while finding common prefix\n + sha1_name: unroll len loop in find_unique_abbrev_r()\n + p4211-line-log.sh: add log --online --raw --parents perf test\n\n Optimize the code to find shortest unique prefix of object names.\n\n Will cook in 'next'.\n\n\n* cc/perf-run-config (2017-09-24) 9 commits\n - perf: store subsection results in \"test-results/$GIT_PERF_SUBSECTION/\"\n - perf/run: show name of rev being built\n - perf/run: add run_subsection()\n - perf/run: update get_var_from_env_or_config() for subsections\n - perf/run: add get_subsections()\n - perf/run: add calls to get_var_from_env_or_config()\n - perf/run: add GIT_PERF_DIRS_OR_REVS\n - perf/run: add get_var_from_env_or_config()\n - perf/run: add '--config' option to the 'run' script\n\n Needs review.\n\n\n* bp/fsmonitor (2017-10-05) 15 commits\n  (merged to 'next' on 2017-10-05 at 964a029d13)\n + fsmonitor: preserve utf8 filenames in fsmonitor-watchman log\n + fsmonitor: read entirety of watchman output\n + fsmonitor: MINGW support for watchman integration\n  (merged to 'next' on 2017-10-02 at cf0c67979c)\n + fsmonitor: add a performance test\n + fsmonitor: add a sample integration script for Watchman\n + fsmonitor: add test cases for fsmonitor extension\n + split-index: disable the fsmonitor extension when running the split index test\n + fsmonitor: add a test tool to dump the index extension\n + update-index: add fsmonitor support to update-index\n + ls-files: Add support in ls-files to display the fsmonitor valid bit\n + fsmonitor: add documentation for the fsmonitor extension.\n + fsmonitor: teach git to optionally utilize a file system monitor to speed up detecting new or changed files.\n + update-index: add a new --force-write-index option\n + preload-index: add override to enable testing preload-index\n + bswap: add 64 bit endianness helper get_be64\n\n We learned to talk to watchman to speed up \"git status\" and other\n operations that need to see which paths have been modified.\n\n Will cook in 'next'.\n\n\n* bw/protocol-v1 (2017-10-17) 11 commits\n  (merged to 'next' on 2017-10-18 at 835fe09e50)\n + Documentation: document Extra Parameters\n + ssh: introduce a 'simple' ssh variant\n + i5700: add interop test for protocol transition\n + http: tell server that the client understands v1\n + connect: tell server that the client understands v1\n + connect: teach client to recognize v1 server response\n + upload-pack, receive-pack: introduce protocol version 1\n + daemon: recognize hidden request arguments\n + protocol: introduce protocol extension mechanisms\n + pkt-line: add packet_write function\n + connect: in ref advertisement, shallows are last\n (this branch is used by jr/ssh-wrappers.)\n\n A new mechanism to upgrade the wire protocol in place is proposed\n and demonstrated that it works with the older versions of Git\n without harming them.\n\n Will cook in 'next'.\n\n\n* pc/submodule-helper (2017-10-07) 3 commits\n  (merged to 'next' on 2017-10-16 at 2b38de12cc)\n + submodule: port submodule subcommand 'status' from shell to C\n + submodule--helper: introduce for_each_listed_submodule()\n + submodule--helper: introduce get_submodule_displaypath()\n\n GSoC.\n Will cook in 'next'.\n\n\n* bc/hash-algo (2017-10-04) 6 commits\n - fixup! hash-algo: integrate hash algorithm support with repo setup\n - hash-algo: switch empty tree and blob lookups to use hash abstraction\n - hash-algo: integrate hash algorithm support with repo setup\n - hash-algo: add structure representing hash algorithm\n - setup: expose enumerated repo info\n - Merge branch 'bc/vcs-svn-cleanup' into bc/hash-algo\n\n Expecting a reroll.\n cf. <20170821000022.26729-1-sandals@crustytoothpaste.net>\n cf. <20171017013405.swzjqc3rwvqjfkov@genre.crustytoothpaste.net>\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 Will be rerolled after tc/curl-with-backports stabilizes.\n\n\n* sb/submodule-recursive-checkout-detach-head (2017-07-28) 2 commits\n  (merged to 'next' on 2017-10-26 at 30994b4c76)\n + Documentation/checkout: clarify submodule HEADs to be detached\n + recursive submodules: detach HEAD from new state\n\n \"git checkout --recursive\" may overwrite and rewind the history of\n the branch that happens to be checked out in submodule\n repositories, which might not be desirable.  Detach the HEAD but\n still allow the recursive checkout to succeed in such a case.\n\n Undecided.\n This needs justification in a larger picture; it is unclear why\n this is better than rejecting recursive checkout, for example.\n\n\n* ex/deprecate-empty-pathspec-as-match-all (2017-06-23) 2 commits\n  (merged to 'next' on 2017-08-14 at 24db08a6e8)\n + pathspec: die on empty strings as pathspec\n + t0027: do not use an empty string as a pathspec element\n\n The final step to make an empty string as a pathspec element\n illegal.  We started this by first deprecating and warning a\n pathspec that has such an element in 2.11 (Nov 2016).\n\n Hopefully we can merge this down to the 'master' by the end of the\n year?  A deprecation warning period that is about 1 year does not\n sound too bad.\n\n Will cook in 'next'.\n As the draft RelNotes says, let's merge this to 'master' after\n this release cycle.\n\n--------------------------------------------------\n[Discarded]\n\n* jk/ui-color-always-to-auto-maint (2017-10-13) 2 commits\n  (merged to 'next' on 2017-10-13 at bb16e1edc8)\n + color: document that \"git -c color.*=always\" is a bit special\n + color: downgrade \"always\" to \"auto\" only for on-disk configuration\n\n It turns out that \"git -c color.ui=always cmd\" is relied on by many\n third-party tools as a way to force coloured output no matter what\n the end-user configuration is, and a recent attempt to downgrade\n 'always' to 'auto' to fix the regression to \"git add -p\" broke it.\n\n This has been reverted from 'next'.\n"},{"id":"331185","messageId":"CAGZ79kYUZv0g+3OEMrbT26A7mSLJzeS-yf5Knr-CnARHqVB=aQ@mail.gmail.com","threadId":"47040","inReplyTo":"xmqq7evhc7nw.fsf@gitster.mtv.corp.google.com","subject":"Re: What's cooking in git.git (Oct 2017, #06; Fri, 27)","fromName":"Stefan Beller","fromEmail":"sbeller@google.com","sentAt":"2017-10-27T18:50:49Z","receivedAt":"2017-10-27T18:50:55Z","isPatch":false,"sender":{"key":"stefanbeller@gmail.com","avatar":"https://avatars.githubusercontent.com/u/455868?v=4"},"body":"> * sb/submodule-recursive-checkout-detach-head (2017-07-28) 2 commits\n>   (merged to 'next' on 2017-10-26 at 30994b4c76)\n>  + Documentation/checkout: clarify submodule HEADs to be detached\n>  + recursive submodules: detach HEAD from new state\n>\n>  \"git checkout --recursive\" may overwrite and rewind the history of\n>  the branch that happens to be checked out in submodule\n>  repositories, which might not be desirable.  Detach the HEAD but\n>  still allow the recursive checkout to succeed in such a case.\n>\n>  Undecided.\n>  This needs justification in a larger picture; it is unclear why\n>  this is better than rejecting recursive checkout, for example.\n\nWe have been running this patch internally for a couple of weeks now,\nand had no complaints by users.\n\nDetaching the submodule HEAD is in line with the current thinking\nof submodules, though I am about to send out a plan later\nasking if we want to keep it that way long term.\n\nThanks,\nStefan\n"},{"id":"331230","messageId":"1509210803.2256.7.camel@gmail.com","threadId":"47040","inReplyTo":"xmqq7evhc7nw.fsf@gitster.mtv.corp.google.com","subject":"Re: What's cooking in git.git (Oct 2017, #06; Fri, 27)","fromName":"Kaartic Sivaraam","fromEmail":"kaartic.sivaraam@gmail.com","sentAt":"2017-10-28T17:13:23Z","receivedAt":"2017-10-28T17:13:41Z","isPatch":false,"sender":{"key":"kaartic.sivaraam@gmail.com","avatar":"https://avatars.githubusercontent.com/u/12448084?v=4"},"body":"On Fri, 2017-10-27 at 17:32 +0900, Junio C Hamano wrote:\n> * jc/branch-name-sanity (2017-10-14) 3 commits\n>   (merged to 'next' on 2017-10-16 at 174646d1c3)\n>  + branch: forbid refs/heads/HEAD\n>  + branch: split validate_new_branchname() into two\n>  + branch: streamline \"attr_only\" handling in validate_new_branchname()\n>  \"git branch\" and \"git checkout -b\" are now forbidden from creating\n>  a branch whose name is \"HEAD\".\n> \n>  Will cook in 'next'.\n> \n> \n\nGood thing this is still cooking in 'next'. I guess there's a bug as a\nconsequence of this series (though that's just a guess and has not been\nconfirmed by a bisection). See,\n\nhttps://public-inbox.org/git/1509209933.2256.4.camel@gmail.com/T/#u\n\n\n-- \nKaartic\n"},{"id":"331269","messageId":"alpine.DEB.2.21.1.1710291409390.6482@virtualbox","threadId":"47040","inReplyTo":"xmqq7evhc7nw.fsf@gitster.mtv.corp.google.com","subject":"Re: What's cooking in git.git (Oct 2017, #06; Fri, 27)","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2017-10-29T13:13:59Z","receivedAt":"2017-10-29T13:14:10Z","isPatch":false,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi Junio,\n\nOn Fri, 27 Oct 2017, Junio C Hamano wrote:\n\n> * cc/git-packet-pm (2017-10-22) 6 commits\n>  - Git/Packet.pm: extract parts of t0021/rot13-filter.pl for reuse\n>  - t0021/rot13-filter: add capability functions\n>  - t0021/rot13-filter: add packet_initialize()\n>  - t0021/rot13-filter: improve error message\n>  - t0021/rot13-filter: improve 'if .. elsif .. else' style\n>  - t0021/rot13-filter: refactor packet reading functions\n> \n>  Parts of a test to drive the long-running content filter interface\n>  has been split into its own module, hopefully to eventually become\n>  reusable.\n> \n>  Expecting a reroll.\n>  The original unfortunately is quite broken in error detection\n>  cases to make the result sub-par as a standalone module before it\n>  gets fixed.\n\nWould you terribly mind adding a SQUASH??? with my suggested fix for\nPERL_NO_MAKEMAKER?\n\nOtherwise, the Windows build will keep failing for `pu`.\n\n> * jr/ssh-wrappers (2017-10-24) 5 commits\n>  - ssh: 'simple' variant does not support --port\n>  - ssh: 'simple' variant does not support -4/-6\n>  - ssh: 'auto' variant to select between 'ssh' and 'simple'\n>  - connect: split ssh command line options into separate function\n>  - connect: split git:// setup into a separate function\n>  (this branch uses bw/protocol-v1.)\n\nLikewise, this needs a SQUASH??? to remove the uplink$X before\n(over-)writing uplink, to pass the test suite on Windows.\n\nOf course, if we could eventually have Continuous Testing of individual\n*branches* (instead of `pu`), then we would not have to see those test\nfailures in every effing single build of `pu`. I mean, there is no need to\ntest things after they were tested already, and failed, right?\n\nCiao,\nDscho\n"},{"id":"331270","messageId":"xmqq7eve9gw4.fsf@gitster.mtv.corp.google.com","threadId":"47040","inReplyTo":"alpine.DEB.2.21.1.1710291409390.6482@virtualbox","subject":"Re: What's cooking in git.git (Oct 2017, #06; Fri, 27)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2017-10-29T14:18:35Z","receivedAt":"2017-10-29T14:18:43Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:\n\n> Would you terribly mind adding a SQUASH??? with my suggested fix for\n> PERL_NO_MAKEMAKER?\n> ..\n> Likewise, this needs a SQUASH??? to remove the uplink$X before\n> (over-)writing uplink, to pass the test suite on Windows.\n\nSurely I don't mind; please just send me something I can \"git am\"\n(or something I can \"git apply --index && git commit -m SQAUSH???\"\nwould be sufficient) for these; letting me construct and/or type a\npatch from pieces of discussion messages is a sure way to introduce\nfurther issues for Windows, as I don't have a way to test any such\nchange before I push them out.\n\nThanks.\n"},{"id":"331272","messageId":"alpine.DEB.2.21.1.1710291614020.6482@virtualbox","threadId":"47040","inReplyTo":"xmqq7eve9gw4.fsf@gitster.mtv.corp.google.com","subject":"Re: What's cooking in git.git (Oct 2017, #06; Fri, 27)","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2017-10-29T15:18:43Z","receivedAt":"2017-10-29T15:18:55Z","isPatch":false,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi Junio,\n\nOn Sun, 29 Oct 2017, Junio C Hamano wrote:\n\n> Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:\n> \n> > Would you terribly mind adding a SQUASH??? with my suggested fix for\n> > PERL_NO_MAKEMAKER?\n> > ..\n> > Likewise, this needs a SQUASH??? to remove the uplink$X before\n> > (over-)writing uplink, to pass the test suite on Windows.\n> \n> Surely I don't mind; please just send me something I can \"git am\"\n> (or something I can \"git apply --index && git commit -m SQAUSH???\"\n> would be sufficient) for these; letting me construct and/or type a\n> patch from pieces of discussion messages is a sure way to introduce\n> further issues for Windows, as I don't have a way to test any such\n> change before I push them out.\n\nLet's make this more convenient for *both* of us. You can find one fixup\nin the `jr/ssh-wrappers` branch at https://github.com/dscho/git, and the\nsecond one at `cc/git-packet-pm`. Both should fast-forward from your\nbranches of the same name.\n\nCiao,\nDscho\n"},{"id":"331303","messageId":"xmqqfua18lxe.fsf@gitster.mtv.corp.google.com","threadId":"47040","inReplyTo":"alpine.DEB.2.21.1.1710291614020.6482@virtualbox","subject":"Re: What's cooking in git.git (Oct 2017, #06; Fri, 27)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2017-10-30T01:27:25Z","receivedAt":"2017-10-30T01:30:52Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:\n\n> Let's make this more convenient for *both* of us. You can find one fixup\n> in the `jr/ssh-wrappers` branch at https://github.com/dscho/git, and the\n> second one at `cc/git-packet-pm`. Both should fast-forward from your\n> branches of the same name.\n\nThanks.  \n\nI didn't follow these lenghthy back-and-forth closely enough to\nnotice that they boiled down to one liner each that needs squashing\n;-)\n\nFetched, looked at, and signed off before merging them to 'pu'.\n\n"},{"id":"331965","messageId":"xmqq4lq6hmp2.fsf_-_@gitster.mtv.corp.google.com","threadId":"47040","inReplyTo":"CAGZ79kYUZv0g+3OEMrbT26A7mSLJzeS-yf5Knr-CnARHqVB=aQ@mail.gmail.com","subject":"sb/submodule-recursive-checkout-detach-head","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2017-11-07T02:00:57Z","receivedAt":"2017-11-07T02:01:03Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Stefan Beller <sbeller@google.com> writes:\n\n>> * sb/submodule-recursive-checkout-detach-head (2017-07-28) 2 commits\n>>   (merged to 'next' on 2017-10-26 at 30994b4c76)\n>>  + Documentation/checkout: clarify submodule HEADs to be detached\n>>  + recursive submodules: detach HEAD from new state\n>>\n>>  \"git checkout --recursive\" may overwrite and rewind the history of\n>>  the branch that happens to be checked out in submodule\n>>  repositories, which might not be desirable.  Detach the HEAD but\n>>  still allow the recursive checkout to succeed in such a case.\n>>\n>>  Undecided.\n>>  This needs justification in a larger picture; it is unclear why\n>>  this is better than rejecting recursive checkout, for example.\n> ...\n> Detaching the submodule HEAD is in line with the current thinking\n> of submodules, though I am about to send out a plan later\n> asking if we want to keep it that way long term.\n\nDid this \"send out a plan\" ever happen?  I am about to rewind 'next'\nand rebuild on top of v2.15, and wondering if I should keep the\ntopic or kick it back to 'pu' so that a better justification can be\ngiven.\n\n"},{"id":"332016","messageId":"CAGZ79kY=WWTzwyz8t21RghEWAgPphhvUO5ut0O+rL0YhbqeGxQ@mail.gmail.com","threadId":"47040","inReplyTo":"xmqq4lq6hmp2.fsf_-_@gitster.mtv.corp.google.com","subject":"Re: sb/submodule-recursive-checkout-detach-head","fromName":"Stefan Beller","fromEmail":"sbeller@google.com","sentAt":"2017-11-07T17:05:51Z","receivedAt":"2017-11-07T17:05:58Z","isPatch":false,"sender":{"key":"stefanbeller@gmail.com","avatar":"https://avatars.githubusercontent.com/u/455868?v=4"},"body":"On Mon, Nov 6, 2017 at 6:00 PM, Junio C Hamano <gitster@pobox.com> wrote:\n> Stefan Beller <sbeller@google.com> writes:\n>\n>>> * sb/submodule-recursive-checkout-detach-head (2017-07-28) 2 commits\n>>>   (merged to 'next' on 2017-10-26 at 30994b4c76)\n>>>  + Documentation/checkout: clarify submodule HEADs to be detached\n>>>  + recursive submodules: detach HEAD from new state\n>>>\n>>>  \"git checkout --recursive\" may overwrite and rewind the history of\n>>>  the branch that happens to be checked out in submodule\n>>>  repositories, which might not be desirable.  Detach the HEAD but\n>>>  still allow the recursive checkout to succeed in such a case.\n>>>\n>>>  Undecided.\n>>>  This needs justification in a larger picture; it is unclear why\n>>>  this is better than rejecting recursive checkout, for example.\n>> ...\n>> Detaching the submodule HEAD is in line with the current thinking\n>> of submodules, though I am about to send out a plan later\n>> asking if we want to keep it that way long term.\n>\n> Did this \"send out a plan\" ever happen?\n\nNo. (Not yet?)\n\n>  I am about to rewind 'next'\n> and rebuild on top of v2.15, and wondering if I should keep the\n> topic or kick it back to 'pu' so that a better justification can be\n> given.\n\nFeel free to kick back to 'pu'.\n\nThanks,\nStefan\n"},{"id":"332044","messageId":"xmqq375ppqma.fsf@gitster.mtv.corp.google.com","threadId":"47040","inReplyTo":"CAGZ79kY=WWTzwyz8t21RghEWAgPphhvUO5ut0O+rL0YhbqeGxQ@mail.gmail.com","subject":"Re: sb/submodule-recursive-checkout-detach-head","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2017-11-08T00:21:17Z","receivedAt":"2017-11-08T00:21:25Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Stefan Beller <sbeller@google.com> writes:\n\n>>> Detaching the submodule HEAD is in line with the current thinking\n>>> of submodules, though I am about to send out a plan later\n>>> asking if we want to keep it that way long term.\n>>\n>> Did this \"send out a plan\" ever happen?\n>\n> No. (Not yet?)\n>\n>>  I am about to rewind 'next'\n>> and rebuild on top of v2.15, and wondering if I should keep the\n>> topic or kick it back to 'pu' so that a better justification can be\n>> given.\n>\n> Feel free to kick back to 'pu'.\n\nOK.\n\nI am puzzled by the question mark after \"Not yet\", which I could\ninterpret as \"it is even questionable to Stefan that it may or may\nnot happen\", but I'd assume that kicking back to 'pu' and allowing\nit to be reroll will be taken as an opportunity to skip such a\nseparate \"plan\" and instead to clearify the plan and design in an\nupdated log message--that is fine by me, too.\n\nThanks.\n\n"}]}