{"thread":{"id":"50784","subject":"What's cooking in git.git (Mar 2019, #04; Wed, 20)","startedAt":"2019-03-20T03:13:57Z","lastAt":"2019-03-21T11:14:48Z","messageCount":14,"participants":["Junio C Hamano","Thomas Gummerer","Rohit Ashiwal","Ævar Arnfjörð Bjarmason","Duy Nguyen"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"371948","messageId":"xmqqa7hqw844.fsf@gitster-ct.c.googlers.com","threadId":"50784","inReplyTo":null,"subject":"What's cooking in git.git (Mar 2019, #04; Wed, 20)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2019-03-20T03:13:47Z","receivedAt":"2019-03-20T03:13:57Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Here are the topics that have been cooking. Commits prefixed with\n'-' are only in 'pu' (proposed updates) while commits prefixed with\n'+' are in 'next'. The ones marked with '.' do not appear in any of\nthe integration branches, but I am still holding onto them.\n\nYou can find the changes described here in the integration branches\nof the repositories listed at\n\n http://git-blame.blogspot.com/p/git-public-repositories.html\n\n--------------------------------------------------\n[New Topics]\n\n* ms/worktree-add-atomic-mkdir (2019-03-12) 1 commit\n - worktree: fix worktree add race\n\n \"git worktree add\" used to do a \"find an available name with stat\n and then mkdir\", which is race-prone. This has been fixed by using\n mkdir and reacting to EEXIST in a loop.\n\n Will merge to 'next'.\n\n\n* tb/stash-in-c-unused-param-fix (2019-03-11) 1 commit\n - stash: drop unused parameter\n (this branch uses ps/stash-in-c; is tangled with js/stash-in-c-pathspec-fix and tg/stash-in-c-show-default-to-p-fix.)\n\n Code clean-up.\n\n Will merge to 'next'.\n\n\n* dl/subtree-limit-to-one-rev (2019-03-12) 1 commit\n - contrib/subtree: ensure only one rev is provided\n\n \"git subtree\" (in contrib/) update.\n\n Will merge to 'next'.\n\n\n* ar/t4150-remove-cruft (2019-03-13) 1 commit\n - t4150: remove unused variable\n\n Test cleanup.\n\n Will merge to 'next'.\n\n\n* cb/doco-mono (2019-03-13) 2 commits\n - doc: format pathnames and URLs as monospace.\n - doc/CodingGuidelines: URLs and paths as monospace\n\n Clean-up markup in the documentation suite.\n\n Will merge to 'next'.\n\n\n* cc/multi-promisor (2019-03-14) 12 commits\n - promisor-remote.h: fix a 'hdr-check' warning\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 - 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\n\n* jk/promote-ggg (2019-03-13) 1 commit\n - point pull requesters to GitGitGadget\n\n Swap submitGit with GitGitGadget as a way to submit patches based\n on GitHub PR to us.\n\n Will merge to 'next'.\n\n\n* jk/sha1dc (2019-03-13) 1 commit\n - Makefile: fix unaligned loads in sha1dc with UBSan\n\n Build update for SHA-1 with collision detection.\n\n Will merge to 'next'.\n\n\n* jt/submodule-fetch-errmsg (2019-03-14) 1 commit\n - submodule: explain first attempt failure clearly\n\n Error message update.\n\n Will merge to 'next'.\n cf. <20190313175738.252961-1-jonathantanmy@google.com> (v2)\n\n\n* nd/switch-and-restore (2019-03-18) 38 commits\n - doc: promote \"git restore\"\n - completion: support restore\n - SQUASH??? move -p test to 2071 from 2070\n - t: add tests for restore\n - restore: support --patch\n - restore: default to --source=HEAD when only --index is specified\n - restore: add --worktree and --index\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: --orphan defaults to empty tree as HEAD\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: 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\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 cf. <20190317124926.17137-1-pclouds@gmail.com> (switch v4)\n cf. <20190308101655.9767-1-pclouds@gmail.com> (restore v1)\n\n\n* ab/doc-misc-typofixes (2019-03-18) 1 commit\n - doc: fix typos in man pages\n\n Typofixes.\n\n Will merge to 'next'.\n\n\n* ab/drop-scripted-rebase (2019-03-20) 1 commit\n - rebase: remove the rebase.useBuiltin setting\n\n Retire scripted \"git rebase\" implementation.\n\n Will merge to 'next'.\n\n\n* ab/gc-reflog (2019-03-18) 8 commits\n - reflog expire: don't assert the OID when locking refs\n - gc: handle & check gc.reflogExpire config\n - reflog tests: assert lack of early exit with expiry=\"never\"\n - reflog tests: test for the \"points nowhere\" warning\n - reflog tests: make use of \"test_config\" idiom\n - gc: refactor a \"call me once\" pattern\n - gc: convert to using the_hash_algo\n - gc: remove redundant check for gc_auto_threshold\n\n Fix various glitches in \"git gc\" around reflog handling.\n\n cf. <20190315155959.12390-1-avarab@gmail.com> (v3)\n\n\n* ew/repack-with-bitmaps-by-default (2019-03-18) 3 commits\n - pack-objects: default to writing bitmap hash-cache\n - t5310: correctly remove bitmaps for jgit test\n - repack: enable bitmaps by default on bare repos\n\n The connectivity bitmaps are created by default in bare\n repositories now; also the pathname hash-cache is created by\n default to avoid making crappy deltas when repacking.\n\n Will merge to 'next'.\n\n\n* jk/perf-lib-tee (2019-03-18) 1 commit\n - perf-lib.sh: rely on test-lib.sh for --tee handling\n\n Code cleanup in the test framework.\n\n Will merge to 'next'.\n\n\n* js/check-docs-exe (2019-03-14) 1 commit\n - check-docs: fix for setups where executables have an extension\n\n Dev support update.\n\n Will merge to 'next'.\n\n\n* js/difftool-no-index (2019-03-18) 3 commits\n - difftool: allow running outside Git worktrees with --no-index\n - parse-options: make OPT_ARGUMENT() more useful\n - difftool: remove obsolete (and misleading) comment\n\n \"git difftool\" can now run outside a repository.\n\n Will merge to 'next'.\n\n\n* js/get-short-oid-drop-cache (2019-03-14) 4 commits\n - get_oid(): when an object was not found, try harder\n - sequencer: move stale comment into correct location\n - sequencer: improve error message when an OID could not be parsed\n - rebase -i: demonstrate obscure loose object cache bug\n\n A corner-case object name ambiguity while the sequencer machinery\n is working (e.g. \"rebase -i -x\") has been (half) fixed.\n\n Will merge to 'next'.\n\n\n* ma/doc-diff-doc-vs-doctor-comparison (2019-03-18) 4 commits\n - doc-diff: add `--cut-header-footer`\n - doc-diff: support diffing from/to AsciiDoc(tor)\n - doc-diff: let `render_tree()` take an explicit directory name\n - Doc: auto-detect changed build flags\n\n Dev support update to make it easier to compare two formatted\n results from our documentation.\n\n Will merge to 'next'.\n cf. <20190319031412.GC6173@sigill.intra.peff.net>\n\n\n* mh/pack-protocol-doc-fix (2019-03-18) 1 commit\n - fix pack protocol example client/server communication\n\n Docfix.\n\n Will merge to 'next'.\n\n\n* nd/checkout-f-while-conflicted-fix (2019-03-19) 1 commit\n - unpack-trees: fix oneway_merge accidentally carry over stage index\n\n \"git checkout -f \" while the index has an unmerged path\n incorrectly left some paths in an unmerged state, which has been\n corrected.\n\n Will merge to 'next'.\n\n\n* pw/cherry-pick-continue (2019-03-18) 3 commits\n - cherry-pick --continue: remember options\n - cherry-pick: demonstrate option amnesia\n - sequencer: break some long lines\n\n \"git cherry-pick --options A..B\", after giving control back to the\n user to ask help resolving a conflicted step, did not honor the\n options it originally received, which has been corrected.\n\n Will merge to 'next'.\n\n\n* pw/rerere-autoupdate (2019-03-18) 2 commits\n - merge: tweak --rerere-autoupdate documentation\n - am/cherry-pick/rebase/revert: document --rerere-autoupdate\n\n Doc updates.\n\n Will merge to 'next'.\n\n\n* sg/test-atexit (2019-03-14) 11 commits\n - t9811-git-p4-label-import: fix pipeline negation\n - git p4 test: disable '-x' tracing in the p4d watchdog loop\n - git p4 test: simplify timeout handling\n - git p4 test: clean up the p4d cleanup functions\n - git p4 test: use 'test_atexit' to kill p4d and the watchdog process\n - t0301-credential-cache: use 'test_atexit' to stop the credentials helper\n - tests: use 'test_atexit' to stop httpd\n - git-daemon: use 'test_atexit` to stop 'git-daemon'\n - test-lib: introduce 'test_atexit'\n - t/lib-git-daemon: make sure to kill the 'git-daemon' process\n - test-lib: fix interrupt handling with 'dash' and '--verbose-log -x'\n\n Test framework update to more robustly clean up leftover files and\n processes after tests are done.\n\n Will merge to 'next'.\n\n\n* tb/trace2-va-list-fix (2019-03-20) 1 commit\n - trace2: NULL is not allowed for va_list\n\n Fix some code that passed a NULL when a va_list was expected.\n\n Will merge to 'next'.\n\n\n* tg/glossary-overlay (2019-03-18) 1 commit\n - glossary: add definition for overlay\n\n Doc update.\n\n Will merge to 'next'.\n\n\n* tg/stash-in-c-show-default-to-p-fix (2019-03-20) 1 commit\n - stash: setup default diff output format if necessary\n (this branch uses ps/stash-in-c; is tangled with js/stash-in-c-pathspec-fix and tb/stash-in-c-unused-param-fix.)\n\n A regression fix.\n\n Will merge to 'next'.\n\n\n* tz/completion (2019-03-18) 4 commits\n - completion: use __git when calling --list-cmds\n - completion: fix multiple command removals\n - t9902: test multiple removals via completion.commands\n - git: read local config in --list-cmds\n\n The completion helper code now pays attention to repository-local\n configuration (when available), which allows --list-cmds to honour\n a repository specific setting of completion.commands, for example.\n\n Getting there...\n cf. <20190317181620.26727-1-tmz@pobox.com> (v2)\n cf. \n\n\n* tz/t4038-bash-redirect-target-workaround (2019-03-18) 1 commit\n - t4038-diff-combined: quote paths with whitespace\n\n Work-around extra warning from bash in our tests.\n\n Will merge to 'next'.\n\n--------------------------------------------------\n[Stalled]\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\n Will hold.\n cf. \n\n\n* ds/midx-expire-repack (2019-01-27) 10 commits\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 expire/repack\" are new subcommands that\n consult midx file and are used to drop unused pack files and\n coalesce small pack files that are still in use.\n\n Comments?\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. \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* pw/add-p-select (2018-07-26) 4 commits\n - add -p: optimize line selection for short hunks\n - add -p: allow line selection to be inverted\n - add -p: select modified lines correctly\n - add -p: select individual hunk lines\n\n \"git add -p\" interactive interface learned to let users choose\n individual added/removed lines to be used in the operation, instead\n of accepting or rejecting a whole hunk.\n\n Will discard.\n No further feedbacks on the topic for quite some time.\n\n cf. \n I found the feature to be hard to explain, and may result in more\n end-user complaints, but let's see.\n\n\n* nb/branch-show-other-worktrees-head (2019-03-18) 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 The top one probably deserves retitling.\n The second one is of dubious value, but if we are keeping it,\n it should also be retitled.\n\n--------------------------------------------------\n[Cooking]\n\n* dl/ignore-docs (2019-03-08) 2 commits\n - docs: move core.excludesFile from git-add to gitignore\n - git-clean.txt: clarify ignore pattern files\n\n Doc update.\n\n Will merge to 'next'.\n\n\n* jh/resize-convert-scratch-buffer (2019-03-08) 1 commit\n - convert: avoid malloc of original file size\n\n When the \"clean\" filter can reduce the size of a huge file in the\n working tree down to a small \"token\" (a la Git LFS), there is no\n point in allocating a huge scratch area upfront, but the buffer is\n sized based on the original file size. The convert mechanism now\n allocates very minimum and reallocates as it receives the output\n from the clean filter process.\n\n Will merge to 'next'.\n\n\n* jk/line-log-with-patch (2019-03-11) 2 commits\n - line-log: detect unsupported formats\n - line-log: suppress diff output with \"-s\"\n\n \"git log -L,:\" with \"-s\" did not suppress the patch\n output as it should. This has been corrected.\n\n Will merge to 'next'.\n\n\n* js/rebase-deprecate-preserve-merges (2019-03-12) 1 commit\n - rebase: deprecate --preserve-merges\n\n \"git rebase --rebase-merges\" replaces its old \"--preserve-merges\"\n option; the latter is now marked as deprecated.\n\n Will merge to 'next'.\n\n\n* js/init-db-update-for-mingw (2019-03-12) 1 commit\n - mingw: respect core.hidedotfiles = false in git-init again\n\n \"git init\" forgot to read platform-specific repository\n configuration, which made Windows port to ignore settings of\n core.hidedotfiles, for example.\n\n Will merge to 'next'.\n\n\n* js/stash-in-c-pathspec-fix (2019-03-12) 3 commits\n - stash: pass pathspec as pointer\n - built-in stash: handle :(glob) pathspecs again\n - legacy stash: fix \"rudimentary backport of -q\"\n (this branch uses ps/stash-in-c; is tangled with tb/stash-in-c-unused-param-fix and tg/stash-in-c-show-default-to-p-fix.)\n\n Further fixes to \"git stash\" reimplemented in C.\n\n Will merge to 'next'.\n\n\n* nd/rewritten-ref-is-per-worktree (2019-03-08) 3 commits\n - Make sure refs/rewritten/ is per-worktree\n - files-backend.c: reduce duplication in add_per_worktree_entries_to_dir()\n - files-backend.c: factor out per-worktree code in loose_fill_ref_dir()\n\n \"git rebase\" uses the refs/rewritten/ hierarchy to store its\n intermediate states, which inherently makes the hierarchy per\n worktree, but it didn't quite work well.\n\n Will merge to 'next'.\n\n\n* br/commit-tree-parseopt (2019-03-08) 1 commit\n (merged to 'next' on 2019-03-11 at e1228ef04f)\n + commit-tree: utilize parse-options api\n\n Originally merged to 'next' on 2019-03-08\n\n The command line parser of \"git commit-tree\" has been rewritten to\n use the parse-options API.\n\n Will merge to 'master'.\n\n\n* jk/config-type-color-ends-with-lf (2019-03-07) 1 commit\n (merged to 'next' on 2019-03-11 at 810b269d1a)\n + config: document --type=color output is a complete line\n\n Originally merged to 'next' on 2019-03-07\n\n \"git config --type=color ...\" is meant to replace \"git config --get-color\"\n but there is a slight difference that wasn't documented, which is\n now fixed.\n\n Will merge to 'master'.\n\n\n* js/remote-curl-i18n (2019-03-06) 1 commit\n - remote-curl: mark all error messages for translation\n (this branch uses js/anonymize-remote-curl-diag.)\n\n Error messages given from the http transport have been updated so\n that they can be localized.\n\n Will merge to 'next'.\n\n\n* ma/asciidoctor-fixes-more (2019-03-07) 5 commits\n - Documentation: turn middle-of-line tabs into spaces\n - git-svn.txt: drop escaping '\\' that ends up being rendered\n - git.txt: remove empty line before list continuation\n - config/fsck.txt: avoid starting line with dash\n - config/diff.txt: drop spurious backtick\n\n Documentation mark-up fixes.\n\n Will merge to 'next'.\n\n\n* nd/diff-parseopt-3 (2019-03-07) 20 commits\n - diff-parseopt: convert --submodule\n - diff-parseopt: convert --ignore-submodules\n - diff-parseopt: convert --textconv\n - diff-parseopt: convert --ext-diff\n - diff-parseopt: convert --quiet\n - diff-parseopt: convert --exit-code\n - diff-parseopt: convert --color-words\n - diff-parseopt: convert --word-diff-regex\n - diff-parseopt: convert --word-diff\n - diff-parseopt: convert --[no-]color\n - diff-parseopt: convert --[no-]follow\n - diff-parseopt: convert -R\n - diff-parseopt: convert -a|--text\n - diff-parseopt: convert --full-index\n - diff-parseopt: convert --binary\n - diff-parseopt: convert --anchored\n - diff-parseopt: convert --diff-algorithm\n - diff-parseopt: convert --histogram\n - diff-parseopt: convert --patience\n - diff-parseopt: convert --[no-]indent-heuristic\n\n Third batch to teach the diff machinery to use the parse-options\n API.\n\n Will merge to 'next'.\n cf. <20190305123026.7266-1-pclouds@gmail.com>\n\n\n* jt/test-protocol-version (2019-03-07) 8 commits\n - t5552: compensate for v2 filtering ref adv.\n - tests: fix protocol version for overspecifications\n - t5700: only run with protocol version 1\n - t5512: compensate for v0 only sending HEAD symrefs\n - t5503: fix overspecification of trace expectation\n - tests: always test fetch of unreachable with v0\n - t5601: check ssh command only with protocol v0\n - tests: define GIT_TEST_PROTOCOL_VERSION\n\n Help developers by making it easier to run most of the tests under\n different versions of over-the-wire protocols.\n\n Will merge to 'next'.\n cf. \n\n\n* jk/bisect-final-output (2019-03-01) 3 commits\n (merged to 'next' on 2019-03-11 at dea599eb04)\n + bisect: make diff-tree output prettier\n + bisect: fix internal diff-tree config loading\n + bisect: use string arguments to feed internal diff-tree\n\n Originally merged to 'next' on 2019-03-07\n\n The final report from \"git bisect\" used to show the suspected\n culprit using a raw \"diff-tree\", with which there is no output for\n a merge commit. This has been updated to use a more modern and\n human readable output that still is concise enough.\n\n Will merge to 'master'.\n\n\n* jk/fsck-doc (2019-03-05) 2 commits\n (merged to 'next' on 2019-03-11 at 5cd610f73e)\n + fsck: always compute USED flags for unreachable objects\n + doc/fsck: clarify --connectivity-only behavior\n\n Originally merged to 'next' on 2019-03-07\n\n \"git fsck --connectivity-only\" omits computation necessary to sift\n the objects that are not reachable from any of the refs into\n unreachable and dangling. This is now enabled when dangling\n objects are requested (which is done by default, but can be\n overridden with the \"--no-dangling\" option).\n\n Will merge to 'master'.\n\n\n* jk/no-sigpipe-during-network-transport (2019-03-05) 2 commits\n (merged to 'next' on 2019-03-11 at 25900acd0d)\n + fetch: ignore SIGPIPE during network operation\n + fetch: avoid calling write_or_die()\n\n Originally merged to 'next' on 2019-03-07\n\n On platforms where \"git fetch\" is killed with SIGPIPE (e.g. OSX),\n the upload-pack that runs on the other end that hangs up after\n detecting an error could cause \"git fetch\" to die with a signal,\n which led to a flakey test. \"git fetch\" now ignores SIGPIPE during\n the network portion of its operation (this is not a problem as we\n check the return status from our write(2)s).\n\n Will merge to 'master'.\n\n\n* jk/virtual-objects-do-exist (2019-03-05) 1 commit\n (merged to 'next' on 2019-03-11 at 748c79a1f0)\n + rev-list: allow cached objects in existence check\n\n Originally merged to 'next' on 2019-03-07\n\n A recent update broke \"is this object available to us?\" check for\n well-known objects like an empty tree (which should yield \"yes\",\n even when there is no on-disk object for an empty tree), which has\n been corrected.\n\n Will merge to 'master'.\n\n\n* js/anonymize-remote-curl-diag (2019-03-05) 1 commit\n - curl: anonymize URLs in error messages and warnings\n (this branch is used by js/remote-curl-i18n.)\n\n remote-http transport did not anonymize URLs reported in its error\n messages at places.\n\n Will merge to 'next'.\n\n\n* js/rebase-orig-head-fix (2019-03-04) 4 commits\n (merged to 'next' on 2019-03-11 at 4b1b19d391)\n + built-in rebase: set ORIG_HEAD just once, before the rebase\n + built-in rebase: demonstrate that ORIG_HEAD is not set correctly\n + built-in rebase: use the correct reflog when switching branches\n + built-in rebase: no need to check out `onto` twice\n\n Originally merged to 'next' on 2019-03-07\n\n \"git rebase\" that was reimplemented in C did not set ORIG_HEAD\n correctly, which has been corrected.\n\n Will merge to 'master'.\n\n\n* js/stress-test-ui-tweak (2019-03-04) 2 commits\n (merged to 'next' on 2019-03-11 at 223afded1c)\n + tests: introduce --stress-jobs=\n + tests: let --stress-limit= imply --stress\n\n Originally merged to 'next' on 2019-03-07\n\n Dev support.\n\n Will merge to 'master'.\n\n\n* ma/asciidoctor-fixes (2019-03-11) 3 commits\n - asciidoctor-extensions: fix spurious space after linkgit\n - Documentation/Makefile: add missing dependency on asciidoctor-extensions\n - Documentation/Makefile: add missing xsl dependencies for manpages\n\n Build fix around use of asciidoctor instead of asciidoc\n\n Will merge to 'next'.\n\n\n* nd/worktree-name-sanitization (2019-03-11) 2 commits\n - SQUASH???\n - worktree add: sanitize worktree names\n\n In recent versions of Git, per-worktree refs are exposed in\n refs/worktrees// 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 not malforked.\n\n\n* ra/t3600-test-path-funcs (2019-03-08) 3 commits\n - t3600: use helpers to replace test -d/f/e/s \n - t3600: modernize style\n - test functions: add function `test_file_not_empty`\n\n A GSoC micro.\n\n Will merge to 'next'.\n cf. <20190304120801.28763-1-rohit.ashiwal265@gmail.com> (v3)\n\n\n* dl/reset-doc-no-wrt-abbrev (2019-03-06) 1 commit\n - git-reset.txt: clarify documentation\n\n Doc update.\n\n Will merge to 'next'.\n\n\n* ja/dir-rename-doc-markup-fix (2019-03-06) 1 commit\n - Doc: fix misleading asciidoc formating\n\n Doc update.\n\n Will merge to 'next'.\n\n\n* bp/post-index-change-hook (2019-02-15) 1 commit\n (merged to 'next' on 2019-03-11 at cb96d1d7c4)\n + read-cache: add post-index-change hook\n\n Originally merged to 'next' on 2019-02-23\n\n A new hook \"post-index-change\" is called when the on-disk index\n file changes, which can help e.g. a virtualized working tree\n implementation.\n\n Will cook in 'next'.\n\n\n* jc/format-patch-error-check (2019-02-22) 3 commits\n - format-patch: --no-clobber refrains from overwriting output files\n - format-patch: notice failure to open cover letter for writing\n - builtin/log: downcase the beginning of error messages\n\n \"git format-patch\" used overwrite an existing patch/cover-letter\n file. A new \"--no-clobber\" option stops it.\n\n Will merge to 'next' after dropping the tip commit.\n I think the bottom two were indenendently good changes; the top one\n was met with \"Meh\" by reviewer(s), and I tend to agree.\n\n\n* ab/makefile-help-devs-more (2019-02-24) 6 commits\n (merged to 'next' on 2019-03-11 at 898f5f44bc)\n + Makefile: allow for combining DEVELOPER=1 and CFLAGS=\"...\"\n + Makefile: move the setting of *FLAGS closer to \"include\"\n + Makefile: Move *_LIBS assignment into its own section\n + Makefile: add/remove comments at top and tweak whitespace\n + Makefile: move \"strip\" assignment down from flags\n + Makefile: remove an out-of-date comment\n\n Originally merged to 'next' on 2019-03-07\n\n CFLAGS now can be tweaked when invoking Make while using\n DEVELOPER=YesPlease; this did not work well before.\n\n Will merge to 'master'.\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\n* dl/submodule-set-branch (2019-02-08) 3 commits\n - submodule: teach set-branch subcommand\n - submodule--helper: teach config subcommand --unset\n - git-submodule.txt: \"--branch \" option defaults to 'master'\n\n \"git submodule\" learns \"set-branch\" subcommand that allows the\n submodule.*.branch settings to be modified.\n\n Needs sign-off on the tip commit; other than that it seems OK to be in 'next'.\n\n\n* dm/some-stdio-functions-are-macro-on-freebsd (2019-02-01) 1 commit\n - http: cast result to FILE *\n\n Variants of BSD define fileno(fh) as a macro, breaking a program\n that passes a \"void *\" to it.\n\n Expecting a reroll.\n cf. <49B9198C-53E5-42BD-8834-B1EDEB3332CB@usask.ca>\n\n\n* ds/commit-graph-format-v2 (2019-01-29) 8 commits\n - SQUASH : misnamed variables and style fix\n - commit-graph: test verifying a corrupt v2 header\n - commit-graph: implement file format version 2\n - commit-graph: add --version= option\n - commit-graph: create new version flags\n - commit-graph: collapse parameters into flags\n - commit-graph: return with errors during write\n - Merge branch 'bc/sha-256' into ds/commit-graph-format-v2\n\n Introduce version 2 of the commit-graph format to correct\n deficiency in the initial version.\n\n Needs update before merging to 'next'.\n\n\n* sx/evolve (2019-02-15) 8 commits\n . evolve: add the git change list command\n . evolve: implement the git change command\n . evolve: add support for writing metacommits\n . evolve: add the change-table structure\n . evolve: add support for parsing metacommits\n . ref-filter: add the metas namespace to ref-filter\n . sha1-array: implement oid_array_readonly_contains\n . technical doc: add a design doc for the evolve command\n\n The beginning of \"hg evolve\" mimicry.\n\n\n* br/blame-ignore (2019-02-13) 6 commits\n - SQUASH???\n - blame: add tests for ignoring revisions\n - blame: add a config option to mark ignored lines\n - blame: add the ability to ignore commits and their changes\n - blame: use a helper function in blame_chunk()\n - Move init_skiplist() outside of fsck\n\n \"git blame\" learned to \"ignore\" commits in the history, whose\n effects (as well as their presence) get ignored.\n\n Needs update before merging to 'next'.\n\n\n* nd/config-move-to (2019-01-14) 7 commits\n - config.h: fix hdr-check warnings\n - config: add --move-to\n - config: factor out set_config_source_file()\n - config: use OPT_FILENAME()\n - config.c: add repo_config_set_worktree_gently()\n - worktree.c: add get_worktree_config()\n - config.c: avoid git_path() in do_git_config_sequence()\n\n Needs review.\n\n\n* ma/clear-repository-format (2019-03-01) 2 commits\n (merged to 'next' on 2019-03-11 at f3db1c278f)\n + setup: fix memory leaks with `struct repository_format`\n + setup: free old value before setting `work_tree`\n\n Originally merged to 'next' on 2019-03-07\n\n The setup code has been cleaned up to avoid leaks around the\n repository_format structure.\n\n Will merge to 'master'.\n\n\n* dl/merge-cleanup-scissors-fix (2019-03-18) 11 commits\n - cherry-pick/revert: add scissors line on merge conflict\n - sequencer.c: define describe_cleanup_mode\n - merge: add scissors line on merge conflict\n - merge: cleanup messages like commit\n - sequencer.c: remove duplicate code\n - parse-options.h: extract common --cleanup option\n - commit: extract cleanup_mode functions to sequencer\n - t7502: clean up test style\n - t7604: refactor out Git commands upstream of pipe\n - t3507: cleanup space after redirection operators\n - t7600: clean up style\n\n The list of conflicted paths shown in the editor while concluding a\n conflicted merge was shown above the scissors line when the\n clean-up mode is set to \"scissors\", even though it was commented\n out just like the list of updated paths and other information to\n help the user explain the merge better.\n\n Getting there ;-)\n cf. (v7)\n Expecting v9.\n\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* ag/sequencer-reduce-rewriting-todo (2019-03-07) 18 commits\n - rebase--interactive: move transform_todo_file()\n - sequencer: use edit_todo_list() in complete_action()\n - rebase-interactive: rewrite edit_todo_list() to handle the initial edit\n - rebase-interactive: append_todo_help() changes\n - rebase-interactive: use todo_list_write_to_file() in edit_todo_list()\n - sequencer: refactor skip_unnecessary_picks() to work on a todo_list\n - rebase--interactive: move rearrange_squash_in_todo_file()\n - rebase--interactive: move sequencer_add_exec_commands()\n - sequencer: change complete_action() to use the refactored functions\n - sequencer: make sequencer_make_script() write its script to a strbuf\n - sequencer: refactor rearrange_squash() to work on a todo_list\n - sequencer: refactor sequencer_add_exec_commands() to work on a todo_list\n - sequencer: refactor check_todo_list() to work on a todo_list\n - sequencer: introduce todo_list_write_to_file()\n - sequencer: refactor transform_todos() to work on a todo_list\n - sequencer: remove the 'arg' field from todo_item\n - sequencer: make the todo_list structure public\n - sequencer: changes in parse_insn_buffer()\n\n The scripted version of \"git rebase -i\" wrote and rewrote the todo\n list many times during a single step of its operation, and the\n recent C-rewrite made a faithful conversion of the logic to C. The\n implementation has been updated to carry necessary information\n around in-core to avoid rewriting the same file over and over\n unnecessarily.\n\n Will merge to 'next'.\n cf. <20190305191805.13561-1-alban.gruin@gmail.com> (v8)\n\n\n* ps/stash-in-c (2019-03-07) 29 commits\n (merged to 'next' on 2019-03-11 at f568e3be72)\n + tests: add a special setup where stash.useBuiltin is off\n + stash: optionally use the scripted version again\n + stash: add back the original, scripted `git stash`\n + stash: convert `stash--helper.c` into `stash.c`\n + stash: replace all `write-tree` child processes with API calls\n + stash: optimize `get_untracked_files()` and `check_changes()`\n + stash: convert save to builtin\n + stash: make push -q quiet\n + stash: convert push to builtin\n + stash: convert create to builtin\n + stash: convert store to builtin\n + stash: convert show to builtin\n + stash: convert list to builtin\n + stash: convert pop to builtin\n + stash: convert branch to builtin\n + stash: convert drop and clear to builtin\n + stash: convert apply to builtin\n + stash: mention options in `show` synopsis\n + stash: add tests for `git stash show` config\n + stash: rename test cases to be more descriptive\n + t3903: add test for --intent-to-add file\n + t3903: modernize style\n + stash: improve option parsing test coverage\n + ident: don't require calling prepare_fallback_ident first\n + ident: add the ability to provide a \"fallback identity\"\n + strbuf.c: add `strbuf_insertf()` and `strbuf_vinsertf()`\n + strbuf.c: add `strbuf_join_argv()`\n + sha1-name.c: add `get_oidf()` which acts like `get_oid()`\n + Merge branch 'sd/stash-wo-user-name'\n (this branch is used by js/stash-in-c-pathspec-fix, tb/stash-in-c-unused-param-fix and tg/stash-in-c-show-default-to-p-fix.)\n\n Originally merged to 'next' on 2019-03-07\n\n \"git stash\" rewritten in C.\n\n Will cook in 'next'.\n"},{"id":"371951","messageId":"xmqqva0euorx.fsf@gitster-ct.c.googlers.com","threadId":"50784","inReplyTo":"xmqqa7hqw844.fsf@gitster-ct.c.googlers.com","subject":"Re: What's cooking in git.git (Mar 2019, #04; Wed, 20)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2019-03-20T04:56:50Z","receivedAt":"2019-03-20T04:56:55Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Junio C Hamano writes:\n\n> * nb/branch-show-other-worktrees-head (2019-03-18) 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> The top one probably deserves retitling.\n> The second one is of dubious value, but if we are keeping it,\n> it should also be retitled.\n\nSorry, but my commentary in the last paragraph is stale. These\npatches have been updated with more sensible titles (as we can see\nfrom the recent date for the topic). I've moved this topic out of\nStalled section back to Cooking section.\n\n\n"},{"id":"371977","messageId":"CALgYhfPci+m+zG2-83URSkSXCCH-DqGCBguizY9o7YYUaXKDhw@mail.gmail.com","threadId":"50784","inReplyTo":"xmqqa7hqw844.fsf@gitster-ct.c.googlers.com","subject":"Re: What's cooking in git.git (Mar 2019, #04; Wed, 20)","fromName":"Thomas Gummerer","fromEmail":"t.gummerer@gmail.com","sentAt":"2019-03-20T11:23:29Z","receivedAt":"2019-03-20T11:23:42Z","isPatch":false,"sender":{"key":"t.gummerer@gmail.com","avatar":"https://avatars.githubusercontent.com/u/191004?v=4"},"body":"On Wed, Mar 20, 2019 at 3:13 AM Junio C Hamano wrote:\n> * tg/stash-in-c-show-default-to-p-fix (2019-03-20) 1 commit\n> - stash: setup default diff output format if necessary\n> (this branch uses ps/stash-in-c; is tangled with js/stash-in-c-pathspec-fix and tb/stash-in-c-unused-param-fix.)\n>\n> A regression fix.\n>\n> Will merge to 'next'.\n\nPlease hold off on merging this to 'next'. I'm planning on\nsending a v2 based on your and Peff's comments, hopefully\ntonight.\n"},{"id":"372028","messageId":"20190320220509.7180-1-rohit.ashiwal265@gmail.com","threadId":"50784","inReplyTo":"xmqqa7hqw844.fsf@gitster-ct.c.googlers.com","subject":"Re: What's cooking in git.git (Mar 2019, #04; Wed, 20)","fromName":"Rohit Ashiwal","fromEmail":"rohit.ashiwal265@gmail.com","sentAt":"2019-03-20T22:05:09Z","receivedAt":"2019-03-20T22:05:58Z","isPatch":false,"sender":{"key":"rohit.ashiwal265@gmail.com","avatar":"https://avatars.githubusercontent.com/u/31043830?v=4"},"body":"Hey Junio!\n\nOn Wed, 20 Mar 2019 12:13:47 +0900 Junio C Hamano wrote:\n> * ra/t3600-test-path-funcs (2019-03-08) 3 commits\n> - t3600: use helpers to replace test -d/f/e/s \n> - t3600: modernize style\n> - test functions: add function `test_file_not_empty`\n>\n> A GSoC micro.\n>\n> Will merge to 'next'.\n> cf. <20190304120801.28763-1-rohit.ashiwal265@gmail.com> (v3)\n\nIf we are going to merge these in next revision, I say there are some\nminor changes that Eric suggested, basically there were some extra spaces\nin commit messages and a small change in commit message of [PATCH v3 3/3].\nThere will *not* be any change in code. Should I attend to them or we are\nmerging anyway?\n\nFeeling ecstatic\nRohit\n\n"},{"id":"372030","messageId":"871s31dv6o.fsf@evledraar.gmail.com","threadId":"50784","inReplyTo":"xmqqa7hqw844.fsf@gitster-ct.c.googlers.com","subject":"Re: What's cooking in git.git (Mar 2019, #04; Wed, 20)","fromName":"Ævar Arnfjörð Bjarmason","fromEmail":"avarab@gmail.com","sentAt":"2019-03-20T22:42:39Z","receivedAt":"2019-03-20T22:42:43Z","isPatch":false,"sender":{"key":"avarab@gmail.com","avatar":"https://avatars.githubusercontent.com/u/45301?v=4"},"body":"\nOn Wed, Mar 20 2019, Junio C Hamano wrote:\n\n> Here are the topics that have been cooking. Commits prefixed with\n> '-' are only in 'pu' (proposed updates) while commits prefixed with\n> '+' are in 'next'. The ones marked with '.' do not appear in any of\n> the integration branches, but I am still holding onto them.\n\nI have re-rolls & re-submissions of some of my stuff as a WIP, but one\nthing that's fallen between the cracks & should be ready for queuing is\nmy commit-graph segfault bugfix series:\n\nhttps://public-inbox.org/git/20190314214740.23360-1-avarab@gmail.com/\n\nThanks!\n"},{"id":"372032","messageId":"20190320225638.GF32487@hank.intra.tgummerer.com","threadId":"50784","inReplyTo":"20190320220509.7180-1-rohit.ashiwal265@gmail.com","subject":"Re: What's cooking in git.git (Mar 2019, #04; Wed, 20)","fromName":"Thomas Gummerer","fromEmail":"t.gummerer@gmail.com","sentAt":"2019-03-20T22:56:38Z","receivedAt":"2019-03-20T22:56:44Z","isPatch":false,"sender":{"key":"t.gummerer@gmail.com","avatar":"https://avatars.githubusercontent.com/u/191004?v=4"},"body":"On 03/21, Rohit Ashiwal wrote:\n> Hey Junio!\n> \n> On Wed, 20 Mar 2019 12:13:47 +0900 Junio C Hamano wrote:\n> > * ra/t3600-test-path-funcs (2019-03-08) 3 commits\n> > - t3600: use helpers to replace test -d/f/e/s \n> > - t3600: modernize style\n> > - test functions: add function `test_file_not_empty`\n> >\n> > A GSoC micro.\n> >\n> > Will merge to 'next'.\n> > cf. <20190304120801.28763-1-rohit.ashiwal265@gmail.com> (v3)\n> \n> If we are going to merge these in next revision, I say there are some\n> minor changes that Eric suggested, basically there were some extra spaces\n> in commit messages and a small change in commit message of [PATCH v3 3/3].\n> There will *not* be any change in code. Should I attend to them or we are\n> merging anyway?\n\nJunio sometimes applies these fixes himself, if he deems it easier to\napply them directly than to wait for another iteration, and if he has\ntime to do so. If you have a look at the ra/t3600-test-path-funcs\nbranch in gitster/git, e.g. on GitHub [*1*], you can see that Eric's\nsuggestions for the commit message in 3/3 have already been applied,\nso there's nothing more you need to do here at this point.\n\n*1*: https://github.com/gitster/git/tree/ra/t3600-test-path-funcs\n"},{"id":"372036","messageId":"20190320230727.15553-1-rohit.ashiwal265@gmail.com","threadId":"50784","inReplyTo":"20190320225638.GF32487@hank.intra.tgummerer.com","subject":"Re: What's cooking in git.git (Mar 2019, #04; Wed, 20)","fromName":"Rohit Ashiwal","fromEmail":"rohit.ashiwal265@gmail.com","sentAt":"2019-03-20T23:07:27Z","receivedAt":"2019-03-20T23:08:16Z","isPatch":false,"sender":{"key":"rohit.ashiwal265@gmail.com","avatar":"https://avatars.githubusercontent.com/u/31043830?v=4"},"body":"On 2019-03-20 22:56 UTC Thomas Gummerer wrote:\n> Junio sometimes applies these fixes himself, if he deems it easier to\n> apply them directly than to wait for another iteration, and if he has\n> time to do so. If you have a look at the ra/t3600-test-path-funcs\n> branch in gitster/git, e.g. on GitHub [*1*], you can see that Eric's\n> suggestions for the commit message in 3/3 have already been applied,\n> so there's nothing more you need to do here at this point.\n\nThanks Thomas for the information. I think then this patch is good to go\nfor a merge.\n\nFeeling ecstatic\nRohit\n\n"},{"id":"372040","messageId":"xmqqmulpukyf.fsf@gitster-ct.c.googlers.com","threadId":"50784","inReplyTo":"20190320225638.GF32487@hank.intra.tgummerer.com","subject":"Re: What's cooking in git.git (Mar 2019, #04; Wed, 20)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2019-03-21T00:31:36Z","receivedAt":"2019-03-21T00:31:40Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Thomas Gummerer writes:\n\n> On 03/21, Rohit Ashiwal wrote:\n>> Hey Junio!\n>> \n>> On Wed, 20 Mar 2019 12:13:47 +0900 Junio C Hamano wrote:\n>> > * ra/t3600-test-path-funcs (2019-03-08) 3 commits\n>> > - t3600: use helpers to replace test -d/f/e/s \n>> > - t3600: modernize style\n>> > - test functions: add function `test_file_not_empty`\n>> >\n>> > A GSoC micro.\n>> >\n>> > Will merge to 'next'.\n>> > cf. <20190304120801.28763-1-rohit.ashiwal265@gmail.com> (v3)\n>> \n>> If we are going to merge these in next revision, I say there are some\n>> minor changes that Eric suggested, basically there were some extra spaces\n>> in commit messages and a small change in commit message of [PATCH v3 3/3].\n>> There will *not* be any change in code. Should I attend to them or we are\n>> merging anyway?\n>\n> Junio sometimes applies these fixes himself, if he deems it easier to\n> apply them directly than to wait for another iteration, and if he has\n> time to do so. If you have a look at the ra/t3600-test-path-funcs\n> branch in gitster/git, e.g. on GitHub [*1*], you can see that Eric's\n> suggestions for the commit message in 3/3 have already been applied,\n> so there's nothing more you need to do here at this point.\n\nThanks.\n"},{"id":"372043","messageId":"xmqqef71uk8t.fsf@gitster-ct.c.googlers.com","threadId":"50784","inReplyTo":"871s31dv6o.fsf@evledraar.gmail.com","subject":"Re: What's cooking in git.git (Mar 2019, #04; Wed, 20)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2019-03-21T00:46:58Z","receivedAt":"2019-03-21T00:47:03Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Ævar Arnfjörð Bjarmason writes:\n\n> On Wed, Mar 20 2019, Junio C Hamano wrote:\n>\n>> Here are the topics that have been cooking. Commits prefixed with\n>> '-' are only in 'pu' (proposed updates) while commits prefixed with\n>> '+' are in 'next'. The ones marked with '.' do not appear in any of\n>> the integration branches, but I am still holding onto them.\n>\n> I have re-rolls & re-submissions of some of my stuff as a WIP, but one\n> thing that's fallen between the cracks & should be ready for queuing is\n> my commit-graph segfault bugfix series:\n>\n> https://public-inbox.org/git/20190314214740.23360-1-avarab@gmail.com/\n\nThanks. I quickly looked at the difference between the updated one\nand the old one; will take a deeper look later.\n"},{"id":"372053","messageId":"xmqqpnqkst2e.fsf@gitster-ct.c.googlers.com","threadId":"50784","inReplyTo":"xmqqef71uk8t.fsf@gitster-ct.c.googlers.com","subject":"Re: What's cooking in git.git (Mar 2019, #04; Wed, 20)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2019-03-21T05:19:21Z","receivedAt":"2019-03-21T05:19:25Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Junio C Hamano writes:\n\n> Ævar Arnfjörð Bjarmason writes:\n>\n>> On Wed, Mar 20 2019, Junio C Hamano wrote:\n>>\n>>> Here are the topics that have been cooking. Commits prefixed with\n>>> '-' are only in 'pu' (proposed updates) while commits prefixed with\n>>> '+' are in 'next'. The ones marked with '.' do not appear in any of\n>>> the integration branches, but I am still holding onto them.\n>>\n>> I have re-rolls & re-submissions of some of my stuff as a WIP, but one\n>> thing that's fallen between the cracks & should be ready for queuing is\n>> my commit-graph segfault bugfix series:\n>>\n>> https://public-inbox.org/git/20190314214740.23360-1-avarab@gmail.com/\n>\n> Thanks. I quickly looked at the difference between the updated one\n> and the old one; will take a deeper look later.\n\nIt does not seem to play well in 'pu', unfortunately. In my local\ntests, 'pu' without this topic passes, but what I pushed out to\npublic has this topic on top and t5318 does not pass for me.\n\n"},{"id":"372076","messageId":"87va0cd1zp.fsf@evledraar.gmail.com","threadId":"50784","inReplyTo":"xmqqpnqkst2e.fsf@gitster-ct.c.googlers.com","subject":"Re: What's cooking in git.git (Mar 2019, #04; Wed, 20)","fromName":"Ævar Arnfjörð Bjarmason","fromEmail":"avarab@gmail.com","sentAt":"2019-03-21T09:13:14Z","receivedAt":"2019-03-21T09:13:19Z","isPatch":false,"sender":{"key":"avarab@gmail.com","avatar":"https://avatars.githubusercontent.com/u/45301?v=4"},"body":"\nOn Thu, Mar 21 2019, Junio C Hamano wrote:\n\n> Junio C Hamano writes:\n>\n>> Ævar Arnfjörð Bjarmason writes:\n>>\n>>> On Wed, Mar 20 2019, Junio C Hamano wrote:\n>>>\n>>>> Here are the topics that have been cooking. Commits prefixed with\n>>>> '-' are only in 'pu' (proposed updates) while commits prefixed with\n>>>> '+' are in 'next'. The ones marked with '.' do not appear in any of\n>>>> the integration branches, but I am still holding onto them.\n>>>\n>>> I have re-rolls & re-submissions of some of my stuff as a WIP, but one\n>>> thing that's fallen between the cracks & should be ready for queuing is\n>>> my commit-graph segfault bugfix series:\n>>>\n>>> https://public-inbox.org/git/20190314214740.23360-1-avarab@gmail.com/\n>>\n>> Thanks. I quickly looked at the difference between the updated one\n>> and the old one; will take a deeper look later.\n>\n> It does not seem to play well in 'pu', unfortunately. In my local\n> tests, 'pu' without this topic passes, but what I pushed out to\n> public has this topic on top and t5318 does not pass for me.\n\nIt works for me when I apply the series on \"pu\". There's a conflict with\nStolee's ds/commit-graph-format-v2.\n\nThere's a single merge conflict with it around the \"commit-graph\nversion\" error message that needs to be resolved. Here's how I did that:\nhttps://github.com/avar/git/commit/1d69f4ea62973de977466a2e29d116716692a05d\n\nI.e. this conflict:\n\n \tgraph_version = *(unsigned char*)(data + 4);\n <<<<<<< HEAD\n \tif (!graph_version || graph_version > 2) {\n \t\terror(_(\"unsupported graph version %X\"),\n \t\t graph_version);\n =======\n \tif (graph_version != GRAPH_VERSION) {\n \t\terror(_(\"commit-graph version %X does not match version %X\"),\n \t\t graph_version, GRAPH_VERSION);\n \t\treturn NULL;\n \t}\n\n \thash_version = *(unsigned char*)(data + 5);\n \tif (hash_version != oid_version()) {\n \t\terror(_(\"commit-graph hash version %X does not match version %X\"),\n \t\t hash_version, oid_version());\n >>>>>>> commit-graph-fix-segfault-and-exit-3\n \t\treturn NULL;\n \t}\n\nNeeds to be resolved as:\n\n\tgraph_version = *(unsigned char*)(data + 4);\n\tif (!graph_version || graph_version > 2) {\n\t\terror(_(\"commit-graph the graph version %X is unsupported\"),\n\t\t graph_version);\n\t\treturn NULL;\n\t}\n\nI.e. there's a test that greps out \"graph version\".\n\nI can also submit a re-roll on top of his series, but figured describing\nthe merge might be easier...\n"},{"id":"372085","messageId":"xmqq7ecssgpc.fsf@gitster-ct.c.googlers.com","threadId":"50784","inReplyTo":"87va0cd1zp.fsf@evledraar.gmail.com","subject":"Re: What's cooking in git.git (Mar 2019, #04; Wed, 20)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2019-03-21T09:46:23Z","receivedAt":"2019-03-21T09:46:27Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Ævar Arnfjörð Bjarmason writes:\n\n> \tgraph_version = *(unsigned char*)(data + 4);\n> <<<<<<< HEAD\n> \tif (!graph_version || graph_version > 2) {\n> \t\terror(_(\"unsupported graph version %X\"),\n> \t\t graph_version);\n> =======\n> \tif (graph_version != GRAPH_VERSION) {\n> \t\terror(_(\"commit-graph version %X does not match version %X\"),\n> \t\t graph_version, GRAPH_VERSION);\n> \t\treturn NULL;\n> \t}\n>\n> \thash_version = *(unsigned char*)(data + 5);\n> \tif (hash_version != oid_version()) {\n> \t\terror(_(\"commit-graph hash version %X does not match version %X\"),\n> \t\t hash_version, oid_version());\n> >>>>>>> commit-graph-fix-segfault-and-exit-3\n> \t\treturn NULL;\n> \t}\n>\n> Needs to be resolved as:\n>\n> \tgraph_version = *(unsigned char*)(data + 4);\n> \tif (!graph_version || graph_version > 2) {\n> \t\terror(_(\"commit-graph the graph version %X is unsupported\"),\n> \t\t graph_version);\n> \t\treturn NULL;\n> \t}\n>\n> I.e. there's a test that greps out \"graph version\".\n\nYikes.\n\nGiven the common ancestor version's phrasing, and also the updated\nphrasing of the other message since we started supporting v2 of the\ncommit-graph file, I resolved this message to \n\n\t \"unsupported commit-graph version %X\"\n\ninstead. Of course, I wasn't expecting the test to be depending on\nthe exact error message's phrasing X-<.\n\nThanks.\n\n\n"},{"id":"372087","messageId":"87sgvgcy3o.fsf@evledraar.gmail.com","threadId":"50784","inReplyTo":"xmqq7ecssgpc.fsf@gitster-ct.c.googlers.com","subject":"Re: What's cooking in git.git (Mar 2019, #04; Wed, 20)","fromName":"Ævar Arnfjörð Bjarmason","fromEmail":"avarab@gmail.com","sentAt":"2019-03-21T10:37:15Z","receivedAt":"2019-03-21T10:37:21Z","isPatch":false,"sender":{"key":"avarab@gmail.com","avatar":"https://avatars.githubusercontent.com/u/45301?v=4"},"body":"\nOn Thu, Mar 21 2019, Junio C Hamano wrote:\n\n> Ævar Arnfjörð Bjarmason writes:\n>\n>> \tgraph_version = *(unsigned char*)(data + 4);\n>> <<<<<<< HEAD\n>> \tif (!graph_version || graph_version > 2) {\n>> \t\terror(_(\"unsupported graph version %X\"),\n>> \t\t graph_version);\n>> =======\n>> \tif (graph_version != GRAPH_VERSION) {\n>> \t\terror(_(\"commit-graph version %X does not match version %X\"),\n>> \t\t graph_version, GRAPH_VERSION);\n>> \t\treturn NULL;\n>> \t}\n>>\n>> \thash_version = *(unsigned char*)(data + 5);\n>> \tif (hash_version != oid_version()) {\n>> \t\terror(_(\"commit-graph hash version %X does not match version %X\"),\n>> \t\t hash_version, oid_version());\n>> >>>>>>> commit-graph-fix-segfault-and-exit-3\n>> \t\treturn NULL;\n>> \t}\n>>\n>> Needs to be resolved as:\n>>\n>> \tgraph_version = *(unsigned char*)(data + 4);\n>> \tif (!graph_version || graph_version > 2) {\n>> \t\terror(_(\"commit-graph the graph version %X is unsupported\"),\n>> \t\t graph_version);\n>> \t\treturn NULL;\n>> \t}\n>>\n>> I.e. there's a test that greps out \"graph version\".\n>\n> Yikes.\n>\n> Given the common ancestor version's phrasing, and also the updated\n> phrasing of the other message since we started supporting v2 of the\n> commit-graph file, I resolved this message to\n>\n> \t \"unsupported commit-graph version %X\"\n>\n> instead. Of course, I wasn't expecting the test to be depending on\n> the exact error message's phrasing X-<.\n>\n> Thanks.\n\nThe \"pu\" just pushed out as a155e16903ecb60e374d9577216bd1f548bb681a\nfails the tests. The \"hash_version =\" part of the conflict is code that\nneeds to be deleted. In Derrick's v2 code it's been moved down into some\nother code, and checking it there produces a failure.\n\nThis on top of \"pu\" fixes it. Note the changing of the error messages,\nin my earlier 39cd8897bf (\"commit-graph: improve & i18n error messages\",\n2019-03-14) I'd changed all the errors to start with \"commit-graph ...\"\nsomething.\n\nIt would be really neat if you could resolve to carry that forward for\nconsistency, since e.g. the \"hash version...\" error will otherwise be\nprinted out by e.g. \"git status\" and friends without giving the user any\ncontext about it being the commit-graph that's at fault. Maybe\n\"commit-graph the graph version[...]\" is bad wording, but otherwise it's\nthe only error that doesn't start with \"commit-graph...\":\n\ndiff --git a/commit-graph.c b/commit-graph.c\nindex b2f64790aa..28b5b599ee 100644\n--- a/commit-graph.c\n+++ b/commit-graph.c\n@@ -155,14 +155,8 @@ struct commit_graph *parse_commit_graph(void *graph_map, int fd,\n\n \tgraph_version = *(unsigned char*)(data + 4);\n \tif (!graph_version || graph_version > 2) {\n-\t\terror(_(\"unsupported commit-graph version %X\"), graph_version);\n-\t\treturn NULL;\n-\t}\n-\n-\thash_version = *(unsigned char*)(data + 5);\n-\tif (hash_version != oid_version()) {\n-\t\terror(_(\"commit-graph hash version %X does not match version %X\"),\n-\t\t hash_version, oid_version());\n+\t\terror(_(\"commit-graph the graph version %X is unsupported\"),\n+\t\t\tgraph_version);\n \t\treturn NULL;\n \t}\n\n@@ -172,7 +166,7 @@ struct commit_graph *parse_commit_graph(void *graph_map, int fd,\n \tcase 1:\n \t\thash_version = *(unsigned char*)(data + 5);\n \t\tif (hash_version != oid_version()) {\n-\t\t\terror(_(\"hash version %X does not match version %X\"),\n+\t\t\terror(_(\"commit-graph hash version %X does not match version %X\"),\n \t\t\t hash_version, oid_version());\n \t\t\treturn NULL;\n \t\t}\n"},{"id":"372088","messageId":"CACsJy8DgNzGK3g2P7ZyRmd7sbiSOXY07KqYEh-gSsPkEZ+D5Qw@mail.gmail.com","threadId":"50784","inReplyTo":"87sgvgcy3o.fsf@evledraar.gmail.com","subject":"Re: What's cooking in git.git (Mar 2019, #04; Wed, 20)","fromName":"Duy Nguyen","fromEmail":"pclouds@gmail.com","sentAt":"2019-03-21T11:14:18Z","receivedAt":"2019-03-21T11:14:48Z","isPatch":false,"sender":{"key":"pclouds@gmail.com","avatar":"https://avatars.githubusercontent.com/u/720?v=4"},"body":"On Thu, Mar 21, 2019 at 5:37 PM Ævar Arnfjörð Bjarmason\n wrote:\n> diff --git a/commit-graph.c b/commit-graph.c\n> index b2f64790aa..28b5b599ee 100644\n> --- a/commit-graph.c\n> +++ b/commit-graph.c\n> @@ -155,14 +155,8 @@ struct commit_graph *parse_commit_graph(void *graph_map, int fd,\n>\n> graph_version = *(unsigned char*)(data + 4);\n> if (!graph_version || graph_version > 2) {\n> - error(_(\"unsupported commit-graph version %X\"), graph_version);\n> - return NULL;\n> - }\n> -\n> - hash_version = *(unsigned char*)(data + 5);\n> - if (hash_version != oid_version()) {\n> - error(_(\"commit-graph hash version %X does not match version %X\"),\n> - hash_version, oid_version());\n> + error(_(\"commit-graph the graph version %X is unsupported\"),\n\nSlightly off-topic, but it does not seem to be a good idea to use %X\nhere, on a user-visible message, without any indication that it's a\nhexadecimal number. %d would do, or just put 0x%X.\n\n> + graph_version);\n> return NULL;\n> }\n>\n> @@ -172,7 +166,7 @@ struct commit_graph *parse_commit_graph(void *graph_map, int fd,\n> case 1:\n> hash_version = *(unsigned char*)(data + 5);\n> if (hash_version != oid_version()) {\n> - error(_(\"hash version %X does not match version %X\"),\n> + error(_(\"commit-graph hash version %X does not match version %X\"),\n> hash_version, oid_version());\n> return NULL;\n> }\n\n\n\n-- \nDuy\n"}]}