{"thread":{"id":"51318","subject":"What's cooking in git.git (Jun 2019, #04; Fri, 14)","startedAt":"2019-06-14T20:50:41Z","lastAt":"2019-06-21T13:26:56Z","messageCount":14,"participants":["Junio C Hamano","Johannes Schindelin","Phillip Wood","Derrick Stolee"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"377256","messageId":"xmqqh88ruc1b.fsf@gitster-ct.c.googlers.com","threadId":"51318","inReplyTo":null,"subject":"What's cooking in git.git (Jun 2019, #04; Fri, 14)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2019-06-14T20:50:24Z","receivedAt":"2019-06-14T20:50:41Z","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 first batch of topics post 2.22 are now in 'master'.  Let's thin\ndown what are left in 'next' before taking anything new, and try to\nkeep this cycle short.\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/deprecate-R-for-dynpath (2019-05-19) 1 commit\n  (merged to 'next' on 2019-05-19 at 944976e981)\n + Makefile: remove the NO_R_TO_GCC_LINKER flag\n\n The way of specifying the path to find dynamic libraries at runtime\n has been simplified.  The old default to pass -R/path/to/dir has been\n replaced with the new default to pass -Wl,-rpath,/path/to/dir,\n which is the more recent GCC uses.  Those who need to build with an\n old GCC can still use \"CC_LD_DYNPATH=-R\"\n\n\n* ab/fail-prereqs-in-test (2019-05-14) 1 commit\n  (merged to 'next' on 2019-05-16 at d1be55f485)\n + tests: add a special setup where prerequisites fail\n\n Developer support to emulate unsatisfied prerequisites in tests to\n ensure that the remainer of the tests still succeeds when tests\n with prerequisites are skipped.\n\n\n* ab/send-email-transferencoding-fix (2019-05-29) 7 commits\n  (merged to 'next' on 2019-05-29 at c8a99d18c0)\n + send-email: fix regression in sendemail.identity parsing\n + send-email: document --no-[to|cc|bcc]\n + send-email: fix broken transferEncoding tests\n + send-email: remove cargo-culted multi-patch pattern in tests\n  (merged to 'next' on 2019-05-13 at 38c6a1e7e0)\n + send-email: do defaults -> config -> getopt in that order\n + send-email: rename the @bcclist variable for consistency\n + send-email: move the read_config() function above getopts\n\n Since \"git send-email\" learned to take 'auto' as the value for the\n transfer-encoding, it by mistake stopped honoring the values given\n to the configuration variables sendemail.transferencoding and/or\n sendemail.<ident>.transferencoding.  This has been corrected to\n (finally) redoing the order of setting the default, reading the\n configuration and command line options.\n\n\n* dl/format-patch-notes-config (2019-05-17) 2 commits\n  (merged to 'next' on 2019-05-19 at d3f6f1872b)\n + format-patch: teach format.notes config option\n + git-format-patch.txt: document --no-notes option\n\n \"git format-patch\" learns a configuration to set the default for\n its --notes=<ref> option.\n\n\n* en/fast-export-encoding (2019-05-14) 5 commits\n  (merged to 'next' on 2019-05-16 at c88bd3edb5)\n + fast-export: do automatic reencoding of commit messages only if requested\n + fast-export: differentiate between explicitly UTF-8 and implicitly UTF-8\n + fast-export: avoid stripping encoding header if we cannot reencode\n + fast-import: support 'encoding' commit header\n + t9350: fix encoding test to actually test reencoding\n\n The \"git fast-export/import\" pair has been taught to handle commits\n with log messages in encoding other than UTF-8 better.\n\n\n* ew/update-server-info (2019-05-15) 1 commit\n  (merged to 'next' on 2019-05-19 at bf4f2871ab)\n + update-server-info: avoid needless overwrites\n\n \"git update-server-info\" learned not to rewrite the file with the\n same contents.\n\n\n* jk/help-unknown-ref-fix (2019-05-15) 2 commits\n  (merged to 'next' on 2019-05-19 at e3e01160f7)\n + help_unknown_ref(): check for refname ambiguity\n + help_unknown_ref(): duplicate collected refnames\n\n Improve the code to show args with potential typo that cannot be\n interpreted as a commit-ish.\n\n\n* jk/unused-params-final-batch (2019-05-13) 14 commits\n  (merged to 'next' on 2019-05-15 at ef7435264c)\n + verify-commit: simplify parameters to run_gpg_verify()\n + show-branch: drop unused parameter from show_independent()\n + rev-list: drop unused void pointer from finish_commit()\n + remove_all_fetch_refspecs(): drop unused \"remote\" parameter\n + receive-pack: drop unused \"commands\" from prepare_shallow_update()\n + pack-objects: drop unused rev_info parameters\n + name-rev: drop unused parameters from is_better_name()\n + mktree: drop unused length parameter\n + wt-status: drop unused status parameter\n + read-cache: drop unused parameter from threaded load\n + clone: drop dest parameter from copy_alternates()\n + submodule: drop unused prefix parameter from some functions\n + builtin: consistently pass cmd_* prefix to parse_options\n + cmd_{read,write}_tree: rename \"unused\" variable that is used\n\n Remove many unused parameters throughout the codebase, with the\n ultimate aim to allow us compile with -Wunused-parameter cleanly.\n\n\n* js/rebase-cleanup (2019-05-15) 5 commits\n  (merged to 'next' on 2019-05-16 at ccfed8f263)\n + rebase: fold git-rebase--common into the -p backend\n + sequencer: the `am` and `rebase--interactive` scripts are gone\n + .gitignore: there is no longer a built-in `git-rebase--interactive`\n + t3400: stop referring to the scripted rebase\n + Drop unused git-rebase--am.sh\n\n Update supporting parts of \"git rebase\" to remove code that should\n no longer be used.\n\n\n* mh/import-transport-fd-fix (2019-05-16) 2 commits\n  (merged to 'next' on 2019-05-19 at 5e86f92f7a)\n + Use xmmap_gently instead of xmmap in use_pack\n + dup() the input fd for fast-import used for remote helpers\n\n The ownership rule for the file descriptor to fast-import remote\n backend was mixed up, leading to unrelated file descriptor getting\n closed, which has been fixed.\n\n\n* nd/corrupt-worktrees (2019-05-15) 1 commit\n  (merged to 'next' on 2019-05-16 at d92c25f800)\n + worktree add: be tolerant of corrupt worktrees\n\n \"git worktree add\" used to fail when another worktree connected to\n the same repository was corrupt, which has been corrected.\n\n\n* nd/init-relative-template-fix (2019-05-13) 1 commit\n  (merged to 'next' on 2019-05-15 at 4d5b17f712)\n + init: make --template path relative to $CWD\n\n A relative pathname given to \"git init --template=<path> <repo>\"\n ought to be relative to the directory \"git init\" gets invoked in,\n but it instead was made relative to the repository, which has been\n corrected.\n\n\n* nd/merge-quit (2019-05-19) 2 commits\n  (merged to 'next' on 2019-05-19 at 9880e7ee4e)\n + merge: add --quit\n + merge: remove drop_save() in favor of remove_merge_branch_state()\n\n \"git merge\" learned \"--quit\" option that cleans up the in-progress\n merge while leaving the working tree and the index still in a mess.\n\n\n* nd/worktree-name-sanitization (2019-05-15) 1 commit\n  (merged to 'next' on 2019-05-16 at 9a2dd33122)\n + worktree add: sanitize worktree names\n\n In recent versions of Git, per-worktree refs are exposed in\n refs/worktrees/<wtname>/ hierarchy, which means that worktree names\n must be a valid refname component.  The code now sanitizes the names\n given to worktrees, to make sure these refs are well-formed.\n\n\n* pw/rebase-edit-message-for-replayed-merge (2019-05-19) 1 commit\n  (merged to 'next' on 2019-05-19 at dc3e30641c)\n + rebase -r: always reword merge -c\n\n A \"merge -c\" instruction during \"git rebase --rebase-merges\" should\n give the user a chance to edit the log message, even when there is\n otherwise no need to create a new merge and replace the existing\n one (i.e. fast-forward instead), but did not.  Which has been\n corrected.\n\n\n* sb/format-patch-base-patch-id-fix (2019-05-08) 2 commits\n  (merged to 'next' on 2019-05-15 at 1ab7d2b71c)\n + format-patch: make --base patch-id output stable\n + format-patch: inform user that patch-id generation is unstable\n\n The \"--base\" option of \"format-patch\" computed the patch-ids for\n prerequisite patches in an unstable way, which has been updated to\n compute in a way that is compatible with \"git patch-id --stable\".\n\n--------------------------------------------------\n[New Topics]\n\n* js/gcc-8-and-9 (2019-06-13) 4 commits\n - config: avoid calling `labs()` on too-large data type\n - winansi: simplify loading the GetCurrentConsoleFontEx() function\n - kwset: allow building with GCC 8\n - poll (mingw): allow compiling with GCC 8 and DEVELOPER=1\n\n Code clean-up for new compilers.\n\n The 'kwset' one may want to be discussed a bit longer.  Perhaps\n merge the other three earlier to 'next' and then to 'master'\n separately?\n\n\n* pw/add-p-recount (2019-06-13) 1 commit\n - add -p: fix checkout -p with pathological context\n\n \"git checkout -p\" needs to selectively apply a patch in reverse,\n which did not work well.\n\n Will merge to 'next' and then to 'master'.\n\n\n* rs/avoid-overflow-in-midpoint-computation (2019-06-13) 1 commit\n - cleanup: fix possible overflow errors in binary search, part 2\n\n Code clean-up to avoid signed integer overlaps during binary search.\n\n Will merge to 'next' and then to 'master'.\n\n\n* js/t3404-typofix (2019-06-14) 1 commit\n - t3404: fix a typo\n\n Typofix.\n\n Will merge to 'next' and then to 'master'.\n\n--------------------------------------------------\n[Stalled]\n\n* jn/unknown-index-extensions (2018-11-21) 2 commits\n - index: offer advice for unknown index extensions\n - index: do not warn about unrecognized extensions\n\n A bit too alarming warning given when unknown index extensions\n exist is getting revamped.\n\n Expecting a reroll.\n\n\n* jc/format-patch-delay-message-id (2019-04-05) 1 commit\n - format-patch: move message-id and related headers to the end\n\n The location \"git format-patch --thread\" adds the Message-Id:\n header in the series of header fields has been moved down, which\n may help working around a suspected bug in GMail MSA, reported at\n <CAHk-=whP1stFZNAaJiMi5eZ9rj0MRt20Y_yHVczZPH+O01d+sA@mail.gmail.com>\n\n Waiting for feedback to see if it truly helps.\n Needs tests.\n\n\n* jt/fetch-cdn-offload (2019-03-12) 9 commits\n - SQUASH???\n - upload-pack: send part of packfile response as uri\n - fetch-pack: support more than one pack lockfile\n - upload-pack: refactor reading of pack-objects out\n - Documentation: add Packfile URIs design doc\n - Documentation: order protocol v2 sections\n - http-fetch: support fetching packfiles by URL\n - http: improve documentation of http_pack_request\n - http: use --stdin when getting dumb HTTP pack\n\n WIP for allowing a response to \"git fetch\" to instruct the bulk of\n the pack contents to be instead taken from elsewhere (aka CDN).\n\n Stalled\n\n\n* js/protocol-advertise-multi (2018-12-28) 1 commit\n - protocol: advertise multiple supported versions\n\n The transport layer has been updated so that the protocol version\n used can be negotiated between the parties, by the initiator\n listing the protocol versions it is willing to talk, and the other\n side choosing from one of them.\n\n Expecting a reroll.\n cf. <CANq=j3u-zdb_FvNJGPCmygNMScseav63GhVvBX3NcVS4f7TejA@mail.gmail.com>\n\n\n* mk/use-size-t-in-zlib (2018-10-15) 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\n* dl/remote-save-to-push (2018-12-11) 1 commit\n - remote: add --save-to-push option to git remote set-url\n\n \"git remote set-url\" learned a new option that moves existing value\n of the URL field to pushURL field of the remote before replacing\n the URL field with a new value.\n\n Anybody who wants to champion this topic?\n I am personally not yet quite convinced if this is worth pursuing.\n\n--------------------------------------------------\n[Cooking]\n\n* mo/hpux-dynpath (2019-06-07) 1 commit\n - configure: Detect linking style for HP aCC on HP-UX\n\n Auto-detect how to tell HP-UX aCC where to use dynamicallly linked\n libraries from at runtime.\n\n Will merge to 'next' and then to 'master'.\n\n\n* js/mergetool-optim (2019-06-12) 4 commits\n - mergetool: use shell variable magic instead of `awk`\n - mergetool: dissect strings with shell variable magic instead of `expr`\n - t7610-mergetool: use test_cmp instead of test $(cat file) = $txt\n - t7610-mergetool: do not place pipelines headed by `yes` in subshells\n\n \"git mergetool\" and its tests now spawn fewer subprocesses.\n\n Will merge to 'next' and then to 'master'.\n\n\n* cc/test-oidmap (2019-06-13) 3 commits\n - oidmap: use sha1hash() instead of static hash() function\n - t: add t0016-oidmap.sh\n - t/helper: add test-oidmap.c\n\n Extend the test coverage a bit.\n\n\n* ds/midx-expire-repack (2019-06-11) 11 commits\n - t5319-multi-pack-index.sh: test batch size zero\n - midx: add test that 'expire' respects .keep files\n - multi-pack-index: test expire while adding packs\n - midx: implement midx_repack()\n - multi-pack-index: prepare 'repack' subcommand\n - multi-pack-index: implement 'expire' subcommand\n - midx: refactor permutation logic and pack sorting\n - midx: simplify computation of pack name lengths\n - multi-pack-index: prepare for 'expire' subcommand\n - Docs: rearrange subcommands for multi-pack-index\n - repack: refactor pack deletion for future use\n\n \"git multi-pack-index\" learned expire and repack subcommands.\n\n Will merge to 'next'.\n\n\n* md/sort-detached-head-first (2019-06-11) 1 commit\n - ref-filter: sort detached HEAD lines firstly\n\n \"git branch --list\" learned to always output the detached HEAD as\n the first item (when the HEAD is detached, of course), instead of\n relying on the textual order of sorting\n\n At least the test needs to be redone.\n\n\n* nd/completion-no-cache-failure (2019-06-12) 1 commit\n - completion: do not cache if --git-completion-helper fails\n\n An incorrect list of options was cached after command line\n completion failed (e.g. trying to complete a command that requires\n a repository outside one), which has been corrected.\n\n Will merge to 'next' and then to 'master'.\n\n\n* sg/rebase-progress (2019-06-11) 4 commits\n - progress: use term_clear_line()\n - rebase: fix garbled progress display with '-x'\n - pager: add a helper function to clear the last line in the terminal\n - t3404-rebase-interactive: use the 'q_to_cr' helper\n\n Use \"Erase in Line\" CSI sequence that is already used in the editor\n support to clear cruft in the progress output.\n\n Its test may have to be updated to work around glitch in test setup\n on Windows.\n\n\n* sg/trace2-rename (2019-06-12) 1 commit\n - Revert \"test-lib: whitelist GIT_TR2_* in the environment\"\n\n Dev support update to help tracing out tests.\n\n Will merge to 'next' and then to 'master'.\n\n\n* fc/fetch-with-import-fix (2019-06-04) 5 commits\n - fetch: fix regression with transport helpers\n - fetch: make the code more understandable\n - fetch: trivial cleanup\n - t5801 (remote-helpers): add test to fetch tags\n - t5801 (remote-helpers): cleanup refspec stuff\n\n Code restructuring during 2.20 period broke fetching tags via\n \"import\" based transports.\n\n Will merge to 'next' and then to 'master'.\n\n\n* jl/status-reduce-vertical-blank (2019-06-04) 1 commit\n - status: remove the empty line after hints\n (this branch uses nd/switch-and-restore.)\n\n Extra blank lines in \"git status\" output have been reduced.\n\n Needs to wait on nd/switch-and-restore to stabilize.\n\n\n* md/url-parse-harden (2019-06-04) 2 commits\n  (merged to 'next' on 2019-06-06 at b187c3dbfe)\n + url: do not allow %00 to represent NUL in URLs\n + url: do not read past end of buffer\n\n The URL decoding code has been updated to avoid going past the end\n of the string while parsing %-<hex>-<hex> sequence.\n\n Will merge to 'master'.\n\n\n* mo/clang-format-for-each-update (2019-06-04) 1 commit\n  (merged to 'next' on 2019-06-06 at ee3066bb65)\n + clang-format: use git grep to generate the ForEachMacros list\n\n The list of for-each like macros used by clang-format has been\n updated.\n\n Will merge to 'master'.\n\n\n* dl/config-alias-doc (2019-06-06) 2 commits\n - config/alias.txt: document alias accepting non-command first word\n - config/alias.txt: change \" and ' to `\n\n Doc update.\n\n Will merge to 'next' and then to 'master'.\n\n\n* dl/includeif-onbranch (2019-06-05) 1 commit\n - config: learn the \"onbranch:\" includeIf condition\n\n The conditional inclusion mechanism learned to base the choice on\n the branch the HEAD currently is on.\n\n Will merge to 'next'.\n\n\n* ds/commit-graph-incremental (2019-06-12) 16 commits\n - commit-graph: test --split across alternate without --split\n - commit-graph: test octopus merges with --split\n - commit-graph: clean up chains after flattened write\n - commit-graph: verify chains with --shallow mode\n - commit-graph: create options for split files\n - commit-graph: expire commit-graph files\n - commit-graph: allow cross-alternate chains\n - commit-graph: merge commit-graph chains\n - commit-graph: add --split option to builtin\n - commit-graph: write commit-graph chains\n - commit-graph: rearrange chunk count logic\n - commit-graph: add base graphs chunk\n - commit-graph: load commit-graph chains\n - commit-graph: rename commit_compare to oid_compare\n - commit-graph: prepare for commit-graph chains\n - commit-graph: document commit-graph chains\n (this branch uses ds/commit-graph-write-refactor; is tangled with ds/close-object-store.)\n\n The commits in a repository can be described by multiple\n commit-graph files now, which allows the commit-graph files to be\n updated incrementally.\n\n Will merge to 'next'.\n\n\n* tm/tag-gpgsign-config (2019-06-05) 1 commit\n - tag: add tag.gpgSign config option to force all tags be GPG-signed\n\n A new tag.gpgSign configuration variable turns \"git tag -a\" into\n \"git tag -s\".\n\n Will merge to 'next' and then to 'master'.\n\n\n* md/list-objects-filter-memfix (2019-05-31) 1 commit\n  (merged to 'next' on 2019-06-06 at 80f0187cef)\n + list-objects-filter: correct usage of ALLOC_GROW\n\n The filter_data used in the list-objects-filter (which manages a\n lazily sparse clone repository) did not use the dynamic array API\n correctly---'nr' is supposed to point at one past the last element\n of the array in use.  This has been corrected.\n\n Will merge to 'master'.\n\n\n* md/list-objects-filter-parse-msgfix (2019-05-31) 1 commit\n  (merged to 'next' on 2019-06-06 at 736f3c175b)\n + list-objects-filter-options: error is localizeable\n\n Make an end-user facing message localizable.\n\n Will merge to 'master'.\n\n\n* cm/send-email-document-req-modules (2019-05-31) 1 commit\n  (merged to 'next' on 2019-06-06 at acf1c2fc96)\n + send-email: update documentation of required Perl modules\n\n A doc update.\n\n Will merge to 'master'.\n\n\n* po/doc-branch (2019-05-29) 1 commit\n - doc branch: provide examples for listing remote tracking branches\n\n Doc update.\n\n Will merge to 'next' and then to 'master'.\n\n\n* bb/unicode-12.1-reiwa (2019-05-29) 1 commit\n  (merged to 'next' on 2019-05-30 at 016465335c)\n + unicode: update the width tables to Unicode 12.1\n\n Update to Unicode 12.1 width table.\n\n Will merge to 'master'.\n\n\n* ab/hash-object-doc (2019-05-28) 1 commit\n  (merged to 'next' on 2019-06-06 at 8e4d85b906)\n + hash-object doc: stop mentioning git-cvsimport\n\n Doc update.\n\n Will merge to 'master'.\n\n\n* ds/object-info-for-prefetch-fix (2019-05-28) 1 commit\n  (merged to 'next' on 2019-05-29 at ee0055b276)\n + sha1-file: split OBJECT_INFO_FOR_PREFETCH\n\n Code cleanup and futureproof.\n\n Will merge to 'master'.\n\n\n* ds/topo-traversal-using-commit-graph (2019-05-28) 2 commits\n  (merged to 'next' on 2019-05-30 at 590527995e)\n + revision: keep topo-walk free of unintersting commits\n + revision: use generation for A..B --topo-order queries\n\n Prepare use of reachability index in topological walker that works\n on a range (A..B).\n\n Will merge to 'master'.\n\n\n* es/git-debugger-doc (2019-05-28) 1 commit\n  (merged to 'next' on 2019-05-29 at 449ba4ae6c)\n + doc: hint about GIT_DEBUGGER in CodingGuidelines\n\n Doc update.\n\n Will merge to 'master'.\n\n\n* es/grep-require-name-when-needed (2019-05-28) 1 commit\n  (merged to 'next' on 2019-05-29 at e1ec57894a)\n + grep: fail if call could output and name is null\n\n More parameter validation.\n\n Will merge to 'master'.\n\n\n* ew/server-info-remove-crufts (2019-05-28) 1 commit\n  (merged to 'next' on 2019-05-29 at 655ba18f30)\n + server-info: do not list unlinked packs\n\n \"git update-server-info\" used to leave stale packfiles in its\n output, which has been corrected.\n\n Will merge to 'master'.\n\n\n* jk/HEAD-symref-in-xfer-namespaces (2019-05-28) 1 commit\n  (merged to 'next' on 2019-05-29 at c2cfe38955)\n + upload-pack: strip namespace from symref data\n\n The server side support for \"git fetch\" used to show incorrect\n value for the HEAD symbolic ref when the namespace feature is in\n use, which has been corrected.\n\n Will merge to 'master'.\n\n\n* jk/am-i-resolved-fix (2019-05-28) 4 commits\n  (merged to 'next' on 2019-05-29 at e711103b1a)\n + am: fix --interactive HEAD tree resolution\n + am: drop tty requirement for --interactive\n + am: read interactive input from stdin\n + am: simplify prompt response handling\n\n \"git am -i --resolved\" segfaulted after trying to see a commit as\n if it were a tree, which has been corrected.\n\n Will merge to 'master'.\n\n\n* js/bisect-helper-check-get-oid-return-value (2019-05-28) 1 commit\n  (merged to 'next' on 2019-05-29 at 24125b3bc0)\n + bisect--helper: verify HEAD could be parsed before continuing\n\n Code cleanup.\n\n Will merge to 'master'.\n\n\n* js/bundle-verify-require-object-store (2019-05-28) 1 commit\n  (merged to 'next' on 2019-05-29 at 747fbbaf11)\n + bundle verify: error out if called without an object database\n\n \"git bundle verify\" needs to see if prerequisite objects exist in\n the receiving repository, but the command did not check if we are\n in a repository upfront, which has been corrected.\n\n Will merge to 'master'.\n\n\n* js/fsmonitor-unflake (2019-05-28) 2 commits\n  (merged to 'next' on 2019-05-30 at 1aa850bc59)\n + mark_fsmonitor_valid(): mark the index as changed if needed\n + fill_stat_cache_info(): prepare for an fsmonitor fix\n\n The data collected by fsmonitor was not properly written back to\n the on-disk index file, breaking t7519 tests occasionally, which\n has been corrected.\n\n Will merge to 'master'.\n\n\n* mm/p4-unshelve-windows-fix (2019-05-28) 1 commit\n  (merged to 'next' on 2019-05-31 at d45167d723)\n + p4 unshelve: fix \"Not a valid object name HEAD0\" on Windows\n\n The command line to invoke a \"git cat-file\" command from inside\n \"git p4\" was not properly quoted to protect a caret and running a\n broken command on Windows, which has been corrected.\n\n Will merge to 'master'.\n\n\n* pb/request-pull-verify-remote-ref (2019-05-28) 2 commits\n  (merged to 'next' on 2019-05-31 at 0f73300dfa)\n + request-pull: warn if the remote object is not the same as the local one\n + request-pull: quote regex metacharacters in local ref\n\n \"git request-pull\" learned to warn when the ref we ask them to pull\n from in the local repository and in the published repository are\n different.\n\n Will merge to 'master'.\n\n\n* po/git-help-on-git-itself (2019-05-16) 2 commits\n  (merged to 'next' on 2019-05-31 at 455541d73a)\n + Doc: git.txt: remove backticks from link and add git-scm.com/docs\n + git.c: show usage for accessing the git(1) help page\n\n \"git help git\" was hard to discover (well, at least for some\n people).\n\n Will merge to 'master'.\n\n\n* sw/git-p4-unshelve-branched-files (2019-05-28) 1 commit\n  (merged to 'next' on 2019-05-30 at e1985f61fc)\n + git-p4: allow unshelving of branched files\n\n \"git p4\" update.\n\n Will merge to 'master'.\n\n\n* vv/merge-squash-with-explicit-commit (2019-05-28) 1 commit\n  (merged to 'next' on 2019-05-29 at 209baa3e55)\n + merge: refuse --commit with --squash\n\n \"git merge --squash\" is designed to update the working tree and the\n index without creating the commit, and this cannot be countermanded\n by adding the \"--commit\" option; the command now refuses to work\n when both options are given.\n\n Will merge to 'master'.\n\n\n* xl/record-partial-clone-origin (2019-05-29) 1 commit\n  (merged to 'next' on 2019-05-31 at dc291fa199)\n + clone: respect user supplied origin name when setting up partial clone\n\n When creating a partial clone, the object filtering criteria is\n recorded for the origin of the clone, but this incorrectly used a\n hardcoded name \"origin\" to name that remote; it has been corrected\n to honor the \"--origin <name>\" option.\n\n Will merge to 'master'.\n\n\n* jt/partial-clone-missing-ref-delta-base (2019-06-11) 4 commits\n  (merged to 'next' on 2019-06-12 at 95628af9bb)\n + t5616: cover case of client having delta base\n + t5616: use correct flag to check object is missing\n  (merged to 'next' on 2019-05-29 at 5d7573a151)\n + index-pack: prefetch missing REF_DELTA bases\n + t5616: refactor packfile replacement\n\n \"git fetch\" into a lazy clone forgot to fetch base objects that are\n necessary to complete delta in a thin packfile, which has been\n corrected.\n\n Will merge to 'master'.\n\n\n* bl/userdiff-octave (2019-05-29) 2 commits\n  (merged to 'next' on 2019-05-29 at 6ed07afc89)\n + userdiff: fix grammar and style issues\n  (merged to 'next' on 2019-05-19 at 9ea1180d6c)\n + userdiff: add Octave\n\n The pattern \"git diff/grep\" use to extract funcname and words\n boundary for Matlab has been extend to cover Octave, which is more\n or less equivalent.\n\n Will merge to 'master'.\n\n\n* ba/clone-remote-submodules (2019-05-28) 1 commit\n  (merged to 'next' on 2019-05-29 at 71972f94c2)\n + clone: add `--remote-submodules` flag\n\n \"git clone --recurse-submodules\" learned to set up the submodules\n to ignore commit object names recorded in the superproject gitlink\n and instead use the commits that happen to be at the tip of the\n remote-tracking branches from the get-go, by passing the new\n \"--remote-submodules\" option.\n\n Will merge to 'master'.\n\n\n* ds/close-object-store (2019-06-12) 3 commits\n - packfile: rename close_all_packs to close_object_store\n - packfile: close commit-graph in close_all_packs\n - commit-graph: use raw_object_store when closing\n (this branch uses ds/commit-graph-write-refactor; is tangled with ds/commit-graph-incremental.)\n\n The commit-graph file is now part of the \"files that the runtime\n may keep open file descriptors on, all of which would need to be\n closed when done with the object store\", and the file descriptor to\n an existing commit-graph file now is closed before \"gc\" finalizes a\n new instance to replace it.\n\n Will merge to 'next' and then to 'master'.\n\n\n* ml/userdiff-rust (2019-05-30) 2 commits\n  (merged to 'next' on 2019-06-12 at 33b88fa9e5)\n + userdiff: two simplifications of patterns for rust\n  (merged to 'next' on 2019-05-19 at 1266fddce5)\n + userdiff: add built-in pattern for rust\n\n The pattern \"git diff/grep\" use to extract funcname and words\n boundary for Rust has been added.\n\n Will merge to 'master'.\n\n\n* an/ignore-doc-update (2019-06-04) 1 commit\n  (merged to 'next' on 2019-06-06 at 8579d82c0d)\n + gitignore.txt: make slash-rules more readable\n\n The description about slashes in gitignore patterns (used to\n indicate things like \"anchored to this level only\" and \"only\n matches directories\") has been revamped.\n\n Will merge to 'master'.\n\n\n* pw/rebase-abort-clean-rewritten (2019-05-15) 4 commits\n - rebase --abort/--quit: cleanup refs/rewritten\n - sequencer: return errors from sequencer_remove_state()\n - rebase: warn if state directory cannot be removed\n - rebase: fix a memory leak\n\n \"git rebase --abort\" used to leave refs/rewritten/ when concluding\n \"git rebase -r\", which has been corrected.\n\n On hold.\n cf. <20190514180349.17245-1-phillip.wood123@gmail.com>\n\n\n* nb/branch-show-other-worktrees-head (2019-05-07) 3 commits\n - branch: add worktree info on verbose output\n - branch: update output to include worktree info\n - ref-filter: add worktreepath atom\n\n \"git branch --list\" learned to show branches that are checked out\n in other worktrees connected to the same repository prefixed with\n '+', similar to the way the currently checked out branch is shown\n with '*' in front.\n\n Will merge to 'next' and then to 'master'.\n\n\n* es/first-contrib-tutorial (2019-05-29) 3 commits\n  (merged to 'next' on 2019-05-30 at 96317960ab)\n + doc: add some nit fixes to MyFirstContribution\n  (merged to 'next' on 2019-05-19 at 9ddfae82bf)\n + documentation: add anchors to MyFirstContribution\n + documentation: add tutorial for first contribution\n\n A new tutorial targetting specifically aspiring git-core\n developers.\n\n Will merge to 'master'.\n\n\n* cc/multi-promisor (2019-04-15) 17 commits\n - Move core_partial_clone_filter_default to promisor-remote.c\n - Move repository_format_partial_clone to promisor-remote.c\n - Remove fetch-object.{c,h} in favor of promisor-remote.{c,h}\n - remote: add promisor and partial clone config to the doc\n - partial-clone: add multiple remotes in the doc\n - t0410: test fetching from many promisor remotes\n - builtin/fetch: remove unique promisor remote limitation\n - promisor-remote: parse remote.*.partialclonefilter\n - diff: use promisor-remote.h instead of fetch-object.h\n - Use promisor_remote_get_direct() and has_promisor_remote()\n - promisor-remote: use repository_format_partial_clone\n - promisor-remote: add promisor_remote_reinit()\n - promisor-remote: implement promisor_remote_get_direct()\n - Add initial support for many promisor remotes\n - fetch-object: make functions return an error code\n - t0410: remove pipes after git commands\n - Merge branch 'jt/batch-fetch-blobs-in-diff' into cc/multi-promisor\n\n Teach the lazy clone machinery that there can be more than one\n promisor remote and consult them in order when downloading missing\n objects on demand.\n\n\n* nd/switch-and-restore (2019-05-07) 43 commits\n - Declare both git-switch and git-restore experimental\n - help: move git-diff and git-reset to different groups\n - doc: promote \"git restore\"\n - user-manual.txt: prefer 'merge --abort' over 'reset --hard'\n - completion: support restore\n - t: add tests for restore\n - restore: support --patch\n - restore: replace --force with --ignore-unmerged\n - restore: default to --source=HEAD when only --staged is specified\n - restore: reject invalid combinations with --staged\n - restore: add --worktree and --staged\n - checkout: factor out worktree checkout code\n - restore: disable overlay mode by default\n - restore: make pathspec mandatory\n - restore: take tree-ish from --source option instead\n - checkout: split part of it to new command 'restore'\n - doc: promote \"git switch\"\n - completion: support switch\n - t: add tests for switch\n - switch: make --orphan switch to an empty tree\n - switch: reject if some operation is in progress\n - switch: no worktree status unless real branch switch happens\n - switch: implicit dwim, use --no-guess to disable it\n - switch: add short option for --detach\n - switch: only allow explicit detached HEAD\n - switch: reject \"do nothing\" case\n - switch: stop accepting pathspec\n - switch: remove -l\n - switch: add --discard-changes\n - switch: better names for -b and -B\n - checkout: split part of it to new command 'switch'\n - checkout: split options[] array in three pieces\n - checkout: move 'confict_style' and 'dwim_..' to checkout_opts\n - checkout: make \"opts\" in cmd_checkout() a pointer\n - checkout: factor out some code in parse_branchname_arg()\n - checkout: keep most #include sorted\n - checkout: inform the user when removing branch state\n - checkout: advice how to get out of detached HEAD mode\n - t: rename t2014-switch.sh to t2014-checkout-switch.sh\n - git-checkout.txt: fix monospace typeset\n - doc: document --overwrite-ignore\n - git-checkout.txt: fix one syntax line\n - git-checkout.txt: spell out --no-option\n (this branch is used by jl/status-reduce-vertical-blank.)\n\n Two new commands \"git switch\" and \"git restore\" are introduced to\n split \"checking out a branch to work on advancing its history\" and\n \"checking out paths out of the index and/or a tree-ish to work on\n advancing the current history\" out of the single \"git checkout\"\n command.\n\n Will merge to 'next'.\n cf. <20190329103919.15642-1-pclouds@gmail.com> (switch v6)\n cf. <20190425094600.15673-1-pclouds@gmail.com> (restore v3)\n\n\n* jc/format-patch-noclobber (2019-02-22) 1 commit\n - format-patch: --no-clobber refrains from overwriting output files\n\n \"git format-patch\" used to overwrite an existing patch/cover-letter\n file.  A new \"--no-clobber\" option stops it.\n\n Undecided but inclined to discard.\n\n\n* am/p4-branches-excludes (2019-04-02) 8 commits\n - git-p4: respect excluded paths when detecting branches\n - git-p4: add failing test for \"git-p4: respect excluded paths when detecting branches\"\n - git-p4: don't exclude other files with same prefix\n - git-p4: add failing test for \"don't exclude other files with same prefix\"\n - git-p4: don't groom exclude path list on every commit\n - git-p4: match branches case insensitively if configured\n - git-p4: add failing test for \"git-p4: match branches case insensitively if configured\"\n - git-p4: detect/prevent infinite loop in gitCommitByP4Change()\n\n \"git p4\" update.\n\n Is this ready for 'next'?\n\n\n* dl/rebase-i-keep-base (2019-04-25) 6 commits\n - rebase: teach rebase --keep-base\n - rebase: fast-forward --fork-point in more cases\n - rebase: fast-forward --onto in more cases\n - rebase: refactor can_fast_forward into goto tower\n - t3432: test rebase fast-forward behavior\n - t3431: add rebase --fork-point tests\n\n \"git rebase --keep-base <upstream>\" tries to find the original base\n of the topic being rebased and rebase on top of that same base,\n which is useful when running the \"git rebase -i\" (and its limited\n variant \"git rebase -x\").\n\n The command also has learned to fast-forward in more cases where it\n can instead of replaying to recreate identical commits.\n\n On hold.\n cf. <20190508001252.15752-1-avarab@gmail.com>\n cf. <xmqqa7fxionx.fsf@gitster-ct.c.googlers.com>\n\n\n* ds/commit-graph-write-refactor (2019-06-12) 11 commits\n - commit-graph: extract write_commit_graph_file()\n - commit-graph: extract copy_oids_to_commits()\n - commit-graph: extract count_distinct_commits()\n - commit-graph: extract fill_oids_from_all_packs()\n - commit-graph: extract fill_oids_from_commit_hex()\n - commit-graph: extract fill_oids_from_packs()\n - commit-graph: create write_commit_graph_context\n - commit-graph: remove Future Work section\n - commit-graph: collapse parameters into flags\n - commit-graph: return with errors during write\n - commit-graph: fix the_repository reference\n (this branch is used by ds/close-object-store and ds/commit-graph-incremental.)\n\n Renamed from commit-graph-format-v2 and changed scope.\n\n Will merge to 'next' and then to 'master'.\n\n\n* br/blame-ignore (2019-06-10) 9 commits\n - blame: add a test to cover blame_coalesce()\n - blame: use the fingerprint heuristic to match ignored lines\n - blame: add a fingerprint heuristic to match ignored lines\n - blame: optionally track line fingerprints during fill_blame_origin()\n - blame: add config options for the output of ignored or unblamable lines\n - blame: add the ability to ignore commits and their changes\n - blame: use a helper function in blame_chunk()\n - Move oidset_parse_file() to oidset.c\n - fsck: rename and touch up init_skiplist()\n\n \"git blame\" learned to \"ignore\" commits in the history, whose\n effects (as well as their presence) get ignored.\n\n Except for a minor nit in its tests, this seems to be more or less\n ready for 'next'.\n cf. <20190610153014.42055-1-brho@google.com> (v8)\n\n--------------------------------------------------\n[Discarded]\n\n* js/add-i-coalesce-after-editing-hunk (2018-08-28) 1 commit\n . add -p: coalesce hunks before testing applicability\n\n Applicability check after a patch is edited in a \"git add -i/p\"\n session has been improved.\n"},{"id":"377359","messageId":"nycvar.QRO.7.76.6.1906171940201.44@tvgsbejvaqbjf.bet","threadId":"51318","inReplyTo":"xmqqh88ruc1b.fsf@gitster-ct.c.googlers.com","subject":"js/gcc-8-and-9, was Re: What's cooking in git.git (Jun 2019, #04; Fri, 14)","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2019-06-17T17:41:21Z","receivedAt":"2019-06-17T17:41:20Z","isPatch":false,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi Junio,\n\nOn Fri, 14 Jun 2019, Junio C Hamano wrote:\n\n> * js/gcc-8-and-9 (2019-06-13) 4 commits\n>  - config: avoid calling `labs()` on too-large data type\n>  - winansi: simplify loading the GetCurrentConsoleFontEx() function\n>  - kwset: allow building with GCC 8\n>  - poll (mingw): allow compiling with GCC 8 and DEVELOPER=1\n>\n>  Code clean-up for new compilers.\n>\n>  The 'kwset' one may want to be discussed a bit longer.  Perhaps\n>  merge the other three earlier to 'next' and then to 'master'\n>  separately?\n\nOr just take the kwset one with an adjusted commit message because it may\nturn out that the kwset update will be blocked for a while because of\nlicensing issues?\n\nCiao,\nDscho\n"},{"id":"377360","messageId":"nycvar.QRO.7.76.6.1906172001490.44@tvgsbejvaqbjf.bet","threadId":"51318","inReplyTo":"xmqqh88ruc1b.fsf@gitster-ct.c.googlers.com","subject":"pw/rebase-abort-clean-rewritten, was Re: What's cooking in git.git (Jun 2019, #04; Fri, 14)","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2019-06-17T18:06:51Z","receivedAt":"2019-06-17T18:06:49Z","isPatch":false,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi Junio & Phillip,\n\nOn Fri, 14 Jun 2019, Junio C Hamano wrote:\n\n> * pw/rebase-abort-clean-rewritten (2019-05-15) 4 commits\n>  - rebase --abort/--quit: cleanup refs/rewritten\n>  - sequencer: return errors from sequencer_remove_state()\n>  - rebase: warn if state directory cannot be removed\n>  - rebase: fix a memory leak\n>\n>  \"git rebase --abort\" used to leave refs/rewritten/ when concluding\n>  \"git rebase -r\", which has been corrected.\n>\n>  On hold.\n>  cf. <20190514180349.17245-1-phillip.wood123@gmail.com>\n\nThis is just the cover letter of the latest iteration, claiming that\nPhillip would be offline for a couple days (but I am certain that that\nperiod passed).\n\nPhillip, I was under the impression that all reviewer comments had been\nresolved. Does that match your impression?\n\nCiao,\nDscho\n"},{"id":"377362","messageId":"nycvar.QRO.7.76.6.1906171944170.44@tvgsbejvaqbjf.bet","threadId":"51318","inReplyTo":"xmqqh88ruc1b.fsf@gitster-ct.c.googlers.com","subject":"sg/rebase-progress, was Re: What's cooking in git.git (Jun 2019, #04; Fri, 14)","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2019-06-17T18:25:29Z","receivedAt":"2019-06-17T18:25:27Z","isPatch":false,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi Junio,\n\nOn Fri, 14 Jun 2019, Junio C Hamano wrote:\n\n> * sg/rebase-progress (2019-06-11) 4 commits\n>  - progress: use term_clear_line()\n>  - rebase: fix garbled progress display with '-x'\n>  - pager: add a helper function to clear the last line in the terminal\n>  - t3404-rebase-interactive: use the 'q_to_cr' helper\n>\n>  Use \"Erase in Line\" CSI sequence that is already used in the editor\n>  support to clear cruft in the progress output.\n>\n>  Its test may have to be updated to work around glitch in test setup\n>  on Windows.\n\nTwo thoughts on that:\n\n- the problem is an existing test that had to be adjusted for this patch\n  series,\n\n- the existing test has the underlying issue that it casts too wide a net,\n  and catches *non*-regressions more easily than regressions (read: it is\n  false-positive-happy).\n\nAnd most importantly, the \"glitch in the test setup\" was actually a\nfull-blown bug in Git for Windows' MSYS2 runtime (not very likely to hit\nanyone, though), and I fixed it in the meantime. The build for `pu` passes\nnow:\n\nhttps://dev.azure.com/gitgitgadget/git/_build/results?buildId=10882\n\nand also the build for `sg/rebase-progress`:\n\nhttps://dev.azure.com/gitgitgadget/git/_build/results?buildId=10885\n\nGiven that my remaining gripe with the tests was hardly introduced by this\npatch series (although I would have loved to see it fixed in the course of\na next iteration), I tend to be in favor of advancing this to `next`\nas-is. I can always offer a patch on top to clean up as I had suggested.\n\nCiao,\nDscho\n\n\n"},{"id":"377366","messageId":"2a37d4c2-6eec-548d-0bd0-12bbd49c8071@gmail.com","threadId":"51318","inReplyTo":"nycvar.QRO.7.76.6.1906172001490.44@tvgsbejvaqbjf.bet","subject":"Re: pw/rebase-abort-clean-rewritten, was Re: What's cooking in git.git (Jun 2019, #04; Fri, 14)","fromName":"Phillip Wood","fromEmail":"phillip.wood123@gmail.com","sentAt":"2019-06-17T19:04:00Z","receivedAt":"2019-06-17T19:04:06Z","isPatch":false,"sender":{"key":"phillip.wood@dunelm.org.uk","avatar":null},"body":"Hi Dscho & Junio\n\nOn 17/06/2019 19:06, Johannes Schindelin wrote:\n> Hi Junio & Phillip,\n> \n> On Fri, 14 Jun 2019, Junio C Hamano wrote:\n> \n>> * pw/rebase-abort-clean-rewritten (2019-05-15) 4 commits\n>>   - rebase --abort/--quit: cleanup refs/rewritten\n>>   - sequencer: return errors from sequencer_remove_state()\n>>   - rebase: warn if state directory cannot be removed\n>>   - rebase: fix a memory leak\n>>\n>>   \"git rebase --abort\" used to leave refs/rewritten/ when concluding\n>>   \"git rebase -r\", which has been corrected.\n>>\n>>   On hold.\n>>   cf. <20190514180349.17245-1-phillip.wood123@gmail.com>\n> \n> This is just the cover letter of the latest iteration, claiming that\n> Phillip would be offline for a couple days (but I am certain that that\n> period passed).\n\nYes I sent it just before I went offline, but that's a while ago now\n\n> Phillip, I was under the impression that all reviewer comments had been\n> resolved. Does that match your impression?\n\nYes, I think it's ready. Thanks for prompting me dscho, I'd seen this \nwas on hold and then forgotten to write to Junio\n\nBest Wishes\n\nPhillip\n\n> Ciao,\n> Dscho\n> \n"},{"id":"377370","messageId":"xmqqpnncrnr0.fsf@gitster-ct.c.googlers.com","threadId":"51318","inReplyTo":"nycvar.QRO.7.76.6.1906171940201.44@tvgsbejvaqbjf.bet","subject":"Re: js/gcc-8-and-9, was Re: What's cooking in git.git (Jun 2019, #04; Fri, 14)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2019-06-17T19:54:43Z","receivedAt":"2019-06-17T19:54:48Z","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> Hi Junio,\n>\n> On Fri, 14 Jun 2019, Junio C Hamano wrote:\n>\n>> * js/gcc-8-and-9 (2019-06-13) 4 commits\n>>  - config: avoid calling `labs()` on too-large data type\n>>  - winansi: simplify loading the GetCurrentConsoleFontEx() function\n>>  - kwset: allow building with GCC 8\n>>  - poll (mingw): allow compiling with GCC 8 and DEVELOPER=1\n>>\n>>  Code clean-up for new compilers.\n>>\n>>  The 'kwset' one may want to be discussed a bit longer.  Perhaps\n>>  merge the other three earlier to 'next' and then to 'master'\n>>  separately?\n>\n> Or just take the kwset one with an adjusted commit message because it may\n> turn out that the kwset update will be blocked for a while because of\n> licensing issues?\n\nSorry, but I do not understand why you'd want to \"take\" one that you\nsuspect may be blocked for a while.  I'd rather see us unblock the\nother ones that are unproblematic, without taking them hostage,\nwhich was what I meant.\n\n"},{"id":"377383","messageId":"xmqq7e9jsh8j.fsf@gitster-ct.c.googlers.com","threadId":"51318","inReplyTo":"2a37d4c2-6eec-548d-0bd0-12bbd49c8071@gmail.com","subject":"Re: pw/rebase-abort-clean-rewritten, was Re: What's cooking in git.git (Jun 2019, #04; Fri, 14)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2019-06-18T03:30:04Z","receivedAt":"2019-06-18T03:30:12Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Phillip Wood <phillip.wood123@gmail.com> writes:\n\n> Yes I sent it just before I went offline, but that's a while ago now\n\nYup.  IIRC, you told us not to look at the patch \"for now\" as you\nwould be offline, and I was fully expecting that a regular review\nexchange would happen after you come back.\n\nI do not recall seeing much discussion, though, but ...\n\n>> Phillip, I was under the impression that all reviewer comments had been\n>> resolved. Does that match your impression?\n>\n> Yes, I think it's ready. Thanks for prompting me dscho, I'd seen this\n> was on hold and then forgotten to write to Junio\n\n... if you resolved \"all reviewer comments\", it must have seen\nsufficient review, in which case let's merge it to 'next'.\n\nThanks.\n"},{"id":"377388","messageId":"nycvar.QRO.7.76.6.1906181221360.44@tvgsbejvaqbjf.bet","threadId":"51318","inReplyTo":"xmqqpnncrnr0.fsf@gitster-ct.c.googlers.com","subject":"Re: js/gcc-8-and-9, was Re: What's cooking in git.git (Jun 2019, #04; Fri, 14)","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2019-06-18T10:26:06Z","receivedAt":"2019-06-18T10:26:01Z","isPatch":false,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi Junio,\n\nOn Mon, 17 Jun 2019, Junio C Hamano wrote:\n\n> Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:\n>\n> > On Fri, 14 Jun 2019, Junio C Hamano wrote:\n> >\n> >> * js/gcc-8-and-9 (2019-06-13) 4 commits\n> >>  - config: avoid calling `labs()` on too-large data type\n> >>  - winansi: simplify loading the GetCurrentConsoleFontEx() function\n> >>  - kwset: allow building with GCC 8\n> >>  - poll (mingw): allow compiling with GCC 8 and DEVELOPER=1\n> >>\n> >>  Code clean-up for new compilers.\n> >>\n> >>  The 'kwset' one may want to be discussed a bit longer.  Perhaps\n> >>  merge the other three earlier to 'next' and then to 'master'\n> >>  separately?\n> >\n> > Or just take the kwset one with an adjusted commit message because it may\n> > turn out that the kwset update will be blocked for a while because of\n> > licensing issues?\n>\n> Sorry, but I do not understand why you'd want to \"take\" one that you\n> suspect may be blocked for a while.  I'd rather see us unblock the\n> other ones that are unproblematic, without taking them hostage,\n> which was what I meant.\n\nMy apologies for causing confusion.\n\nWhat I *tried* to suggest is to take my minimal `kwset: allow building\nwith GCC 8` together with the other three, as it fixes the build. Without\nit, the build is not fixed under `DEVELOPER=1`, it is still broken.\n\nThis would prevent me from upgrading GCC in Git for Windows' SDK to GCC v8\nor v9, as that SDK is used to run all the CI builds.\n\nSure, having this small wrapper around `xmalloc()` would be a less elegant\nsolution than the alternative (i.e. synchronize our `kwset` with\nupstream). But that alternative will take substantially longer to\nstabilize, and that would block the GCC upgrade substantially longer.\n\nAnd I am quite confident that Gábor (or is it Szeder?) will be very able\nto rebase their changes on top of that small compile fix.\n\nThat's all I meant to say.\n\nCiao,\nDscho\n"},{"id":"377407","messageId":"8690d49e-31f5-e12a-ae8c-dc217a5476cc@gmail.com","threadId":"51318","inReplyTo":"xmqqh88ruc1b.fsf@gitster-ct.c.googlers.com","subject":"ds/commit-graph-incremental (was Re: What's cooking in git.git (Jun 2019, #04; Fri, 14))","fromName":"Derrick Stolee","fromEmail":"stolee@gmail.com","sentAt":"2019-06-18T13:36:08Z","receivedAt":"2019-06-18T13:36:14Z","isPatch":false,"sender":{"key":"stolee@gmail.com","avatar":"https://avatars.githubusercontent.com/u/570044?v=4"},"body":"On 6/14/2019 4:50 PM, Junio C Hamano wrote:\n> * ds/commit-graph-incremental (2019-06-12) 16 commits\n>  - commit-graph: test --split across alternate without --split\n>  - commit-graph: test octopus merges with --split\n>  - commit-graph: clean up chains after flattened write\n>  - commit-graph: verify chains with --shallow mode\n>  - commit-graph: create options for split files\n>  - commit-graph: expire commit-graph files\n>  - commit-graph: allow cross-alternate chains\n>  - commit-graph: merge commit-graph chains\n>  - commit-graph: add --split option to builtin\n>  - commit-graph: write commit-graph chains\n>  - commit-graph: rearrange chunk count logic\n>  - commit-graph: add base graphs chunk\n>  - commit-graph: load commit-graph chains\n>  - commit-graph: rename commit_compare to oid_compare\n>  - commit-graph: prepare for commit-graph chains\n>  - commit-graph: document commit-graph chains\n>  (this branch uses ds/commit-graph-write-refactor; is tangled with ds/close-object-store.)\n> \n>  The commits in a repository can be described by multiple\n>  commit-graph files now, which allows the commit-graph files to be\n>  updated incrementally.\n> \n>  Will merge to 'next'.\n\nPlease hold on this one. I've found multiple issues while integrating\nthis with VFS for Git and there are enough to merit a full re-roll.\nPlease ignore the two patches I sent yesterday as I will incorporate them\ninto the next version of this series.\n\nThanks,\n-Stolee\n"},{"id":"377523","messageId":"xmqqsgs5r6of.fsf@gitster-ct.c.googlers.com","threadId":"51318","inReplyTo":"nycvar.QRO.7.76.6.1906181221360.44@tvgsbejvaqbjf.bet","subject":"Re: js/gcc-8-and-9, was Re: What's cooking in git.git (Jun 2019, #04; Fri, 14)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2019-06-19T14:28:00Z","receivedAt":"2019-06-19T14:28:06Z","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> What I *tried* to suggest is to take my minimal `kwset: allow building\n> with GCC 8` together with the other three, as it fixes the build. Without\n> it, the build is not fixed under `DEVELOPER=1`, it is still broken.\n\nAh, of course, we can do that.  \n\nWhether we are going to replace with newer LGPL2.1 copy (which I\nthink is more conservative and tend to prefer) or removing it and\nrequire PCREv2 from everybody who does not want to see their\nfixed-grep performance degraded, we won't keep the \"hack\" when we\ntake the one of these solutions for longer term, but it is a minimal\nand obvious workaround.\n"},{"id":"377524","messageId":"xmqqo92tr6hj.fsf@gitster-ct.c.googlers.com","threadId":"51318","inReplyTo":"8690d49e-31f5-e12a-ae8c-dc217a5476cc@gmail.com","subject":"Re: ds/commit-graph-incremental (was Re: What's cooking in git.git (Jun 2019, #04; Fri, 14))","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2019-06-19T14:32:08Z","receivedAt":"2019-06-19T14:32:13Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Derrick Stolee <stolee@gmail.com> writes:\n\n> On 6/14/2019 4:50 PM, Junio C Hamano wrote:\n>> * ds/commit-graph-incremental (2019-06-12) 16 commits\n>>  - commit-graph: test --split across alternate without --split\n>\n> Please hold on this one. I've found multiple issues while integrating\n> this with VFS for Git and there are enough to merit a full re-roll.\n\nThanks.\n\n> Please ignore the two patches I sent yesterday as I will incorporate them\n> into the next version of this series.\n\nI think I picked up \"normalize c-g filenames\" and queued it directly\non top of this topic, but I do not recall the other one, which\nprobably means I did ignore it so hopefully no harm done ;-)\n\n"},{"id":"377525","messageId":"bd56bd14-a4e3-7f99-f4d8-982c0b223bb5@gmail.com","threadId":"51318","inReplyTo":"xmqqo92tr6hj.fsf@gitster-ct.c.googlers.com","subject":"Re: ds/commit-graph-incremental (was Re: What's cooking in git.git (Jun 2019, #04; Fri, 14))","fromName":"Derrick Stolee","fromEmail":"stolee@gmail.com","sentAt":"2019-06-19T14:37:53Z","receivedAt":"2019-06-19T14:37:57Z","isPatch":false,"sender":{"key":"stolee@gmail.com","avatar":"https://avatars.githubusercontent.com/u/570044?v=4"},"body":"On 6/19/2019 10:32 AM, Junio C Hamano wrote:\n> Derrick Stolee <stolee@gmail.com> writes:\n> \n>> On 6/14/2019 4:50 PM, Junio C Hamano wrote:\n>>> * ds/commit-graph-incremental (2019-06-12) 16 commits\n>>>  - commit-graph: test --split across alternate without --split\n>>\n>> Please hold on this one. I've found multiple issues while integrating\n>> this with VFS for Git and there are enough to merit a full re-roll.\n> \n> Thanks.\n> \n>> Please ignore the two patches I sent yesterday as I will incorporate them\n>> into the next version of this series.\n> \n> I think I picked up \"normalize c-g filenames\" and queued it directly\n> on top of this topic, but I do not recall the other one, which\n> probably means I did ignore it so hopefully no harm done ;-)\n\nDo you mean you applied the v6 patches? [1]\n\nThe range-diff included some changes that are necessary due to textual or\nsemantic conflicts with ds/close-object-store, but one change was hidden\nin PATCH 10 that is important:\n.\n10:  2093bab5b1 ! 10:  65b1cc6ae9 commit-graph: allow cross-alternate chains\n     @@ -97,6 +97,8 @@\n      -\tfor (i = 0; i < count && valid; i++) {\n      -\t\tchar *graph_name;\n      -\t\tstruct commit_graph *g;\n     ++\tprepare_alt_odb(r);\n     ++\n      +\tfor (i = 0; i < count; i++) {\n      +\t\tstruct object_directory *odb;\n\nIf you replayed the entire v6 series on top of ds/close-object-store, then\neverything is as I had hoped. Otherwise, I can take a look at what you have\napplied after the next cooking email and send new patches.\n\nThanks,\n-Stolee       \n\n[1] https://public-inbox.org/git/pull.184.v6.git.gitgitgadget@gmail.com/T/#u\n"},{"id":"377635","messageId":"b2afef27-96f8-b262-2cda-4c22dc604d2d@gmail.com","threadId":"51318","inReplyTo":"xmqq7e9jsh8j.fsf@gitster-ct.c.googlers.com","subject":"Re: pw/rebase-abort-clean-rewritten, was Re: What's cooking in git.git (Jun 2019, #04; Fri, 14)","fromName":"Phillip Wood","fromEmail":"phillip.wood123@gmail.com","sentAt":"2019-06-20T09:34:53Z","receivedAt":"2019-06-20T09:34:59Z","isPatch":false,"sender":{"key":"phillip.wood@dunelm.org.uk","avatar":null},"body":"Hi Junio & dscho\n\nOn 18/06/2019 04:30, Junio C Hamano wrote:\n> Phillip Wood <phillip.wood123@gmail.com> writes:\n> \n>> Yes I sent it just before I went offline, but that's a while ago now\n> \n> Yup.  IIRC, you told us not to look at the patch \"for now\" as you\n> would be offline, and I was fully expecting that a regular review\n> exchange would happen after you come back.\n> \n> I do not recall seeing much discussion, though, but ...\n\nYou're right there hasn't been much discussion I assume dscho is happy \nwith the new version if he's asking for it to be picked up.\n\n>>> Phillip, I was under the impression that all reviewer comments had been\n>>> resolved. Does that match your impression?\n>>\n>> Yes, I think it's ready. Thanks for prompting me dscho, I'd seen this\n>> was on hold and then forgotten to write to Junio\n> \n> ... if you resolved \"all reviewer comments\", it must have seen\n> sufficient review, in which case let's merge it to 'next'.\n\nThanks\n\nPhillip\n> Thanks.\n> \n"},{"id":"377742","messageId":"nycvar.QRO.7.76.6.1906211526400.44@tvgsbejvaqbjf.bet","threadId":"51318","inReplyTo":"b2afef27-96f8-b262-2cda-4c22dc604d2d@gmail.com","subject":"Re: pw/rebase-abort-clean-rewritten, was Re: What's cooking in git.git (Jun 2019, #04; Fri, 14)","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2019-06-21T13:27:03Z","receivedAt":"2019-06-21T13:26:56Z","isPatch":false,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi,\n\nOn Thu, 20 Jun 2019, Phillip Wood wrote:\n\n> On 18/06/2019 04:30, Junio C Hamano wrote:\n> > Phillip Wood <phillip.wood123@gmail.com> writes:\n> >\n> > > Yes I sent it just before I went offline, but that's a while ago now\n> >\n> > Yup.  IIRC, you told us not to look at the patch \"for now\" as you\n> > would be offline, and I was fully expecting that a regular review\n> > exchange would happen after you come back.\n> >\n> > I do not recall seeing much discussion, though, but ...\n>\n> You're right there hasn't been much discussion I assume dscho is happy\n> with the new version if he's asking for it to be picked up.\n\nIndeed, that's what I tried to ask... ;-)\n\nCiao,\nDscho\n"}]}