payload: {"push_id":3906500207,"size":13,"distinct_size":0,"ref":"refs/heads/jk/tree-diff-bitmaps","head":"8d910f9c3d20c7b0095d17be3834038a0b916f41","before":"855d9adfbbab5ce6ffc80a86fe508243e3ac2d56","commits":[{"sha":"6d16922798bbb87ddbc1ff1d23ba8ea65f4f6d3b","author":{"name":"Mark Rushakoff","email":"e9e19ae7454ef0f0040e21c07c708e1e781e6760@gmail.com"},"message":"doc: typo: s/can not/cannot/ and s/is does/does/\n\n\"Can not\" suggests one has the option to not do something, whereas\n\"cannot\" more strongly suggests something is disallowed or impossible.\n\nNoticed \"can not\", mistakenly used instead of \"cannot\" in git help\nglossary, then ran git grep 'can not' and found many other instances.\nOnly files in the Documentation folder were modified.\n\n'Can not' also occurs in some source code comments and some test\nassertion messages, and there is an error message and translation \"can\nnot move directory into itself\" which I may fix and submit separately\nfrom the documentation change.\n\nAlso noticed and fixed \"is does\" in git help fetch, but there are no\nother occurrences of that typo according to git grep.\n\nSigned-off-by: Mark Rushakoff <mark.rushakoff@gmail.com>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":false,"url":"https://api.github.com/repos/peff/git/commits/6d16922798bbb87ddbc1ff1d23ba8ea65f4f6d3b"},{"sha":"21416f0a0753890d2364c52c1df107304cb5e9ab","author":{"name":"William Chargin","email":"366634280b879ce3c6c984f83d5675d046b04925@gmail.com"},"message":"restore: fix typo in docs\n\nSigned-off-by: William Chargin <wchargin@gmail.com>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":false,"url":"https://api.github.com/repos/peff/git/commits/21416f0a0753890d2364c52c1df107304cb5e9ab"},{"sha":"a35bea40b674b21fbdb98d982e41c46d014ced83","author":{"name":"Derrick Stolee","email":"ee0b68d4428a726bf8f65d5915bcba7139f7e5c7@microsoft.com"},"message":"commit-graph: fix bug around octopus merges\n\nIn 1771be90 \"commit-graph: merge commit-graph chains\" (2019-06-18),\nthe method sort_and_scan_merged_commits() was added to merge the\ncommit lists of two commit-graph files in the incremental format.\nUnfortunately, there was an off-by-one error in that method around\nincrementing num_extra_edges, which leads to an incorrect offset\nfor the base graph chunk.\n\nWhen we store an octopus merge in the commit-graph file, we store\nthe first parent in the normal place, but use the second parent\nposition to point into the \"extra edges\" chunk where the remaining\nparents exist. This means we should be adding \"num_parents - 1\"\nedges to this list, not \"num_parents - 2\". That is the basic error.\n\nThe reason this was not caught in the test suite is more subtle.\nIn 5324-split-commit-graph.sh, we test creating an octopus merge\nand adding it to the tip of a commit-graph chain, then verify the\nresult. This _should_ have caught the problem, except that when\nwe load the commit-graph files we were overly careful to not fail\nwhen the commit-graph chain does not match. This care was on\npurpose to avoid race conditions as one process reads the chain\nand another process modifies it. In such a case, the reading\nprocess outputs the following message to stderr:\n\n\twarning: commit-graph chain does not match\n\nThese warnings are output in the test suite, but ignored. By\nchecking the stderr of `git commit-graph verify` to include\nthe expected progress output, it will now catch this error.\n\nSigned-off-by: Derrick Stolee <dstolee@microsoft.com>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":false,"url":"https://api.github.com/repos/peff/git/commits/a35bea40b674b21fbdb98d982e41c46d014ced83"},{"sha":"ff6d54771af2c92867f773a264200f22b4cb2ab9","author":{"name":"Elijah Newren","email":"955405675e5ddb1a110d200661c528aa223ef60f@gmail.com"},"message":"merge-recursive: avoid directory rename detection in recursive case\n\nEver since commit 8c8e5bd6eb33 (\"merge-recursive: switch directory\nrename detection default\", 2019-04-05), the default handling with\ndirectory rename detection was to report a conflict and leave unstaged\nentries in the index.  However, when creating a virtual merge base in\nthe recursive case, we absolutely need a tree, and the only way a tree\ncan be written is if we have no unstaged entries -- otherwise we hit a\nBUG().\n\nThere are a few fixes possible here which at least fix the BUG(), but\nnone of them seem optimal for other reasons; see the comments with the\nnew testcase 13e in t6043 for details (which testcase triggered a BUG()\nprior to this patch).  As such, just opt for a very conservative and\nsimple choice that is still relatively reasonable: have the recursive\ncase treat 'conflict' as 'false' for opt->detect_directory_renames.\n\nReported-by: Emily Shaffer <emilyshaffer@google.com>\nSigned-off-by: Elijah Newren <newren@gmail.com>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":false,"url":"https://api.github.com/repos/peff/git/commits/ff6d54771af2c92867f773a264200f22b4cb2ab9"},{"sha":"182f59daf04e5343a8965d84abe2cdae32ed5e81","author":{"name":"Jean-Noël Avila","email":"8cca2c18266a3734c3d4ac934e512c14cddbcb43@free.fr"},"message":"l10n: reformat some localized strings for v2.23.0\n\nSigned-off-by: Jean-Noël Avila <jn.avila@free.fr>\nSigned-off-by: Junio C Hamano <gitster@pobox.com>","distinct":false,"url":"https://api.github.com/repos/peff/git/commits/182f59daf04e5343a8965d84abe2cdae32ed5e81"},{"sha":"3bcedae27ea2af2e3895d92d6525231e350c91be","author":{"name":"Junio C Hamano","email":"a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com"},"message":"Merge branch 'ds/commit-graph-octopus-fix'\n\ncommit-graph did not handle commits with more than two parents\ncorrectly, which has been corrected.\n\n* ds/commit-graph-octopus-fix:\n  commit-graph: fix bug around octopus merges","distinct":false,"url":"https://api.github.com/repos/peff/git/commits/3bcedae27ea2af2e3895d92d6525231e350c91be"},{"sha":"68c1ac4a0bdff0c0522a243e520f16995ade5959","author":{"name":"Junio C Hamano","email":"a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com"},"message":"Merge branch 'mr/doc-can-not-to-cannot'\n\nDocfix.\n\n* mr/doc-can-not-to-cannot:\n  doc: typo: s/can not/cannot/ and s/is does/does/","distinct":false,"url":"https://api.github.com/repos/peff/git/commits/68c1ac4a0bdff0c0522a243e520f16995ade5959"},{"sha":"c0a6c6614dcb660a31ac8b716a89a8911b1ab6d6","author":{"name":"Junio C Hamano","email":"a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com"},"message":"Merge branch 'nd/switch-and-restore'\n\nDocfix.\n\n* nd/switch-and-restore:\n  restore: fix typo in docs","distinct":false,"url":"https://api.github.com/repos/peff/git/commits/c0a6c6614dcb660a31ac8b716a89a8911b1ab6d6"},{"sha":"0bdaec1d3db90d69041531311fb34fa09639589b","author":{"name":"Junio C Hamano","email":"a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com"},"message":"Merge branch 'en/disable-dir-rename-in-recursive-merge'\n\n\"merge-recursive\" hit a BUG() when building a virtual merge base\ndetected a directory rename.\n\n* en/disable-dir-rename-in-recursive-merge:\n  merge-recursive: avoid directory rename detection in recursive case","distinct":false,"url":"https://api.github.com/repos/peff/git/commits/0bdaec1d3db90d69041531311fb34fa09639589b"},{"sha":"c2a8c3701b25929b6df2a999b3e8d1a19ee55fc0","author":{"name":"Junio C Hamano","email":"a6723cc3f76163bf7adb636a73ac3b0ceb3e6b9b@pobox.com"},"message":"Merge branch 'ja/l10n-fixes'\n\nA few messages have been updated to help localization better.\n\n* ja/l10n-fixes:\n  l10n: reformat some localized strings for v2.23.0","distinct":false,"url":"https://api.github.com/repos/peff/git/commits/c2a8c3701b25929b6df2a999b3e8d1a19ee55fc0"},{"sha":"cb29c834e6c6a065f93af756216757d17253368d","author":{"name":"Jeff King","email":"696e3fbcf235d40b6ea1ebd61c87cbea79d444e7@peff.net"},"message":"initial tree-bitmap proof of concept","distinct":false,"url":"https://api.github.com/repos/peff/git/commits/cb29c834e6c6a065f93af756216757d17253368d"},{"sha":"85aa836b436b4828d3f1af40f454aed782f87f25","author":{"name":"Jeff King","email":"696e3fbcf235d40b6ea1ebd61c87cbea79d444e7@peff.net"},"message":"test-tree-bitmap: add \"dump\" mode\n\nThis teaches \"gen\" mode (formerly the only mode) to include\nthe list of paths, and to prefix each bitmap with its\nmatching oid.\n\nThe \"dump\" mode can then read that back in and generate the\nlist of changed paths. This should be almost identical to:\n\n  git rev-list --all |\n  git diff-tree --stdin --name-only -t\n\nThe one difference is the sort order: git's diff output is\nin tree-sort order, so a subtree \"foo\" sorts like \"foo/\",\nwhich is after \"foo.bar\". Whereas the bitmap path list has a\ntrue byte sort, which puts \"foo.bar\" after \"foo\".","distinct":false,"url":"https://api.github.com/repos/peff/git/commits/85aa836b436b4828d3f1af40f454aed782f87f25"},{"sha":"8d910f9c3d20c7b0095d17be3834038a0b916f41","author":{"name":"Jeff King","email":"696e3fbcf235d40b6ea1ebd61c87cbea79d444e7@peff.net"},"message":"test-tree-bitmap: replace ewah with custom rle encoding\n\nThe rules are basically:\n\n - each bitmap is a series of counts of runs of 0/1\n\n - each count is one of our standard varints\n\n - each bitmap must have at least one initial count of\n   zeroes (which may itself be a zero-length count, if the\n   first bit is set)\n\n - a zero-length count anywhere else marks the end of\n   the bitmap\n\nFor a sparse bitmap, these will tend to be quite short,\nbecause long runs are encoded as fairly small counts. The\nworst case is an alternate 0/1/0/1 bitmap, where we will\nspend a full byte to specify each bit (thus bloating it by a\nfactor of 8 over an uncompressed bitmap).","distinct":false,"url":"https://api.github.com/repos/peff/git/commits/8d910f9c3d20c7b0095d17be3834038a0b916f41"}]}
other: {"actor":{"display_login":"peff"}}