Description
Here's the Weekly Digest for gitgitgadget/git:
ISSUES
Last week 4 issues were created.
Of these, 2 issues have been closed and 2 issues are still open.
OPEN ISSUES
💚 #309 doc: fix repeated words, by mark-rushakoff
💚 #306 Fix a problem with PCRE2 and nedmalloc, found via Azure Pipelines, by dscho
CLOSED ISSUES
❤️ #308 [v2.23.0 BUG] commit-graph: fix bug around octopus merges, by derrickstolee
❤️ #307 [v2.23.0 BUG] commit-graph: fix bug around octopus merges, by derrickstolee
NOISY ISSUE
🔈 #308 [v2.23.0 BUG] commit-graph: fix bug around octopus merges, by derrickstolee
It received 12 comments.
PULL REQUESTS
Last week, 8 pull requests were created, updated or merged.
UPDATED PULL REQUEST
Last week, 8 pull requests were updated.
💛 #309 doc: fix repeated words, by mark-rushakoff
💛 #306 Fix a problem with PCRE2 and nedmalloc, found via Azure Pipelines, by dscho
💛 #305 Port git to Plan 9, by lufia
💛 #298 trace2: clean up formatting in perf target format, by jeffhostetler
💛 #294 rebase -r: support merge strategies other than recursive, by dscho
💛 #292 Create 'feature.*' config area and some centralized config parsing, by derrickstolee
💛 #177 documentation: add lab for first contribution, by nasamuffin
💛 #170 git add -i: add a rudimentary version in C (supporting only status and help so far), by dscho
COMMITS
Last week there were 21 commits.
🛠️ Git 2.23-rc2 Signed-off-by: Junio C Hamano gitster@pobox.com by gitster
🛠️ Merge branch 'bc/hash-independent-tests-part-4' Test fix. * bc/hash-independent-tests-part-4: t0000: reword comments for "local" test t: decrease nesting in test_oid_to_path by gitster
🛠️ Merge branch 'rs/plug-strbuf-reak-in-read-alt-refs' Leakfix. * rs/plug-strbuf-reak-in-read-alt-refs: sha1-file: release strbuf after use by gitster
🛠️ Merge branch 'mt/dir-iterator-updates' Leakfix. * mt/dir-iterator-updates: test-dir-iterator: use path argument directly dir-iterator: release strbuf after use by gitster
🛠️ Merge branch 'ds/commit-graph-incremental' Leakfix. * ds/commit-graph-incremental: commit-graph: release strbufs after use by gitster
🛠️ Merge branch 'ja/l10n-fixes' A few messages have been updated to help localization better. * ja/l10n-fixes: l10n: reformat some localized strings for v2.23.0 by gitster
🛠️ Merge branch 'en/disable-dir-rename-in-recursive-merge' "merge-recursive" hit a BUG() when building a virtual merge base detected a directory rename. * en/disable-dir-rename-in-recursive-merge: merge-recursive: avoid directory rename detection in recursive case by gitster
🛠️ Merge branch 'nd/switch-and-restore' Docfix. * nd/switch-and-restore: restore: fix typo in docs by gitster
🛠️ Merge branch 'mr/doc-can-not-to-cannot' Docfix. * mr/doc-can-not-to-cannot: doc: typo: s/can not/cannot/ and s/is does/does/ by gitster
🛠️ Merge branch 'ds/commit-graph-octopus-fix' commit-graph did not handle commits with more than two parents correctly, which has been corrected. * ds/commit-graph-octopus-fix: commit-graph: fix bug around octopus merges by gitster
🛠️ t0000: reword comments for "local" test Commit 01d3a526ad (t0000: check whether the shell supports the "local" keyword, 2017-10-26) added a test to gather data on whether people run the test suite with shells that don't support "local". After almost two years, nobody has complained, and several other uses have cropped up in test-lib-functions.sh. Let's declare it acceptable to use. Signed-off-by: Jeff King peff@peff.net Signed-off-by: Junio C Hamano gitster@pobox.com by peff
🛠️ t: decrease nesting in test_oid_to_path t1410.3 ("corrupt and checks") fails when run using dash versions before 0.5.8, with a cryptic message: mv: cannot stat '.git/objects//e84adb2704cbd49549e52169b4043871e13432': No such file or directory The function generating that path: test_oid_to_path () { echo "${1%${1#??}}/${1#??}" } which is supposed to produce a result like 12/3456789.... But a dash bug[] causes it to instead expand to /3456789... The stream of symbols that makes up this function is hard for humans to follow, too. The complexity mostly comes from the repeated use of the expression ${1#??} for the basename of the loose object. Use a variable instead --- nowadays, the dialect of shell used by Git permits local variables, so this is cheap. An alternative way to work around [] is to remove the double-quotes around test_oid_to_path's return value. That makes the expression easier for dash to read, but harder for humans. Let's prefer the rephrasing that's helpful for humans, too. Noticed by building on Ubuntu trusty, which uses dash 0.5.7. [*] Fixed by v0.5.8~13 ("[EXPAND] Propagate EXP_QPAT in subevalvar, 2013-08-23). Signed-off-by: Jonathan Nieder jrnieder@gmail.com Signed-off-by: Junio C Hamano gitster@pobox.com by jrn
🛠️ sha1-file: release strbuf after use Signed-off-by: René Scharfe l.s.r@web.de Signed-off-by: Junio C Hamano gitster@pobox.com by rscharfe
🛠️ test-dir-iterator: use path argument directly Avoid allocating and leaking a strbuf for holding a verbatim copy of the path argument and pass the latter directly to dir_iterator_begin() instead. Signed-off-by: René Scharfe l.s.r@web.de Signed-off-by: Junio C Hamano gitster@pobox.com by rscharfe
🛠️ dir-iterator: release strbuf after use Signed-off-by: René Scharfe l.s.r@web.de Signed-off-by: Junio C Hamano gitster@pobox.com by rscharfe
🛠️ commit-graph: release strbufs after use Signed-off-by: René Scharfe l.s.r@web.de Acked-by: Derrick Stolee dstolee@microsoft.com Signed-off-by: Junio C Hamano gitster@pobox.com by rscharfe
🛠️ l10n: reformat some localized strings for v2.23.0 Signed-off-by: Jean-Noël Avila jn.avila@free.fr Signed-off-by: Junio C Hamano gitster@pobox.com by jnavila
🛠️ merge-recursive: avoid directory rename detection in recursive case Ever since commit 8c8e5bd6eb33 ("merge-recursive: switch directory rename detection default", 2019-04-05), the default handling with directory rename detection was to report a conflict and leave unstaged entries in the index. However, when creating a virtual merge base in the recursive case, we absolutely need a tree, and the only way a tree can be written is if we have no unstaged entries -- otherwise we hit a BUG(). There are a few fixes possible here which at least fix the BUG(), but none of them seem optimal for other reasons; see the comments with the new testcase 13e in t6043 for details (which testcase triggered a BUG() prior to this patch). As such, just opt for a very conservative and simple choice that is still relatively reasonable: have the recursive case treat 'conflict' as 'false' for opt->detect_directory_renames. Reported-by: Emily Shaffer emilyshaffer@google.com Signed-off-by: Elijah Newren newren@gmail.com Signed-off-by: Junio C Hamano gitster@pobox.com by newren
🛠️ commit-graph: fix bug around octopus merges In 1771be90 "commit-graph: merge commit-graph chains" (2019-06-18), the method sort_and_scan_merged_commits() was added to merge the commit lists of two commit-graph files in the incremental format. Unfortunately, there was an off-by-one error in that method around incrementing num_extra_edges, which leads to an incorrect offset for the base graph chunk. When we store an octopus merge in the commit-graph file, we store the first parent in the normal place, but use the second parent position to point into the "extra edges" chunk where the remaining parents exist. This means we should be adding "num_parents - 1" edges to this list, not "num_parents - 2". That is the basic error. The reason this was not caught in the test suite is more subtle. In 5324-split-commit-graph.sh, we test creating an octopus merge and adding it to the tip of a commit-graph chain, then verify the result. This should have caught the problem, except that when we load the commit-graph files we were overly careful to not fail when the commit-graph chain does not match. This care was on purpose to avoid race conditions as one process reads the chain and another process modifies it. In such a case, the reading process outputs the following message to stderr: warning: commit-graph chain does not match These warnings are output in the test suite, but ignored. By checking the stderr of git commit-graph verify to include the expected progress output, it will now catch this error. Signed-off-by: Derrick Stolee dstolee@microsoft.com Signed-off-by: Junio C Hamano gitster@pobox.com by derrickstolee
🛠️ restore: fix typo in docs Signed-off-by: William Chargin wchargin@gmail.com Signed-off-by: Junio C Hamano gitster@pobox.com by wchargin
🛠️ doc: typo: s/can not/cannot/ and s/is does/does/ "Can not" suggests one has the option to not do something, whereas "cannot" more strongly suggests something is disallowed or impossible. Noticed "can not", mistakenly used instead of "cannot" in git help glossary, then ran git grep 'can not' and found many other instances. Only files in the Documentation folder were modified. 'Can not' also occurs in some source code comments and some test assertion messages, and there is an error message and translation "can not move directory into itself" which I may fix and submit separately from the documentation change. Also noticed and fixed "is does" in git help fetch, but there are no other occurrences of that typo according to git grep. Signed-off-by: Mark Rushakoff mark.rushakoff@gmail.com Signed-off-by: Junio C Hamano gitster@pobox.com by mark-rushakoff
CONTRIBUTORS
Last week there were 9 contributors.
👤 gitster
👤 peff
👤 jrn
👤 rscharfe
👤 jnavila
👤 newren
👤 derrickstolee
👤 wchargin
👤 mark-rushakoff
STARGAZERS
Last week there was 1 stargazer.
⭐ goggle
You are the star! 🌟
RELEASES
Last week there were no releases.
That's all for last week, please 👀 Watch and ⭐ Star the repository gitgitgadget/git to receive next weekly updates. 😃
You can also view all Weekly Digests by clicking here.
Your Weekly Digest bot. 📆