Weekly Digest (21 July, 2019 - 28 July, 2019)

[weekly-digest]

Here's the Weekly Digest for gitgitgadget/git:

---

ISSUES

Last week 5 issues were created.
Of these, 0 issues have been closed and 5 issues are still open.

OPEN ISSUES

💚 #296 Add the REBASE_P prerequisite to two more test cases, by dscho
💚 #295 git svn: use rebase --rebase-merges instead of preserve-merges, by dscho
💚 #294 rebase -r: support merge strategies other than recursive, by dscho
💚 #293 Clean up more of the fall-out from dropping the scripted git rebase, by dscho
💚 #292 Create 'feature.*' config area and some centralized config parsing, by derrickstolee

NOISY ISSUE

🔈 #294 rebase -r: support merge strategies other than recursive, by dscho
It received 8 comments.

---

PULL REQUESTS

Last week, 10 pull requests were created, updated or merged.

UPDATED PULL REQUEST

Last week, 10 pull requests were updated.
💛 #296 Add the REBASE_P prerequisite to two more test cases, by dscho
💛 #295 git svn: use rebase --rebase-merges instead of preserve-merges, by dscho
💛 #294 rebase -r: support merge strategies other than recursive, by dscho
💛 #293 Clean up more of the fall-out from dropping the scripted git rebase, by dscho
💛 #292 Create 'feature.*' config area and some centralized config parsing, by derrickstolee
💛 #290 Travis CI: Lint for Python syntax errors and undefined names, by cclauss
💛 #287 Reinstate support for Visual Studio, by dscho
💛 #219 Show an error if too-long paths are seen by git clean -dfx, by dscho
💛 #195 Drop support for git rebase --preserve-merges, by dscho
💛 #170 git add -i: add a rudimentary version in C (supporting only status and help so far), by dscho

---

COMMITS

Last week there were 45 commits.
🛠️ Sync with maint Signed-off-by: Junio C Hamano gitster@pobox.com by gitster
🛠️ Flush fixes up to the third batch post 2.22.0 Signed-off-by: Junio C Hamano gitster@pobox.com by gitster
🛠️ Merge branch 'ab/hash-object-doc' into maint Doc update. * ab/hash-object-doc: hash-object doc: stop mentioning git-cvsimport by gitster
🛠️ Merge branch 'cm/send-email-document-req-modules' into maint A doc update. * cm/send-email-document-req-modules: send-email: update documentation of required Perl modules by gitster
🛠️ Merge branch 'sw/git-p4-unshelve-branched-files' into maint "git p4" update. * sw/git-p4-unshelve-branched-files: git-p4: allow unshelving of branched files by gitster
🛠️ Merge branch 'js/bisect-helper-check-get-oid-return-value' into maint Code cleanup. * js/bisect-helper-check-get-oid-return-value: bisect--helper: verify HEAD could be parsed before continuing by gitster
🛠️ Merge branch 'es/git-debugger-doc' into maint Doc update. * es/git-debugger-doc: doc: hint about GIT_DEBUGGER in CodingGuidelines by gitster
🛠️ Merge branch 'mo/clang-format-for-each-update' into maint The list of for-each like macros used by clang-format has been updated. * mo/clang-format-for-each-update: clang-format: use git grep to generate the ForEachMacros list by gitster
🛠️ Merge branch 'md/url-parse-harden' into maint The URL decoding code has been updated to avoid going past the end of the string while parsing %-- sequence. * md/url-parse-harden: url: do not allow %00 to represent NUL in URLs url: do not read past end of buffer by gitster
🛠️ Merge branch 'an/ignore-doc-update' into maint The description about slashes in gitignore patterns (used to indicate things like "anchored to this level only" and "only matches directories") has been revamped. * an/ignore-doc-update: gitignore.txt: make slash-rules more readable by gitster
🛠️ Merge branch 'md/list-objects-filter-memfix' into maint The filter_data used in the list-objects-filter (which manages a lazily sparse clone repository) did not use the dynamic array API correctly---'nr' is supposed to point at one past the last element of the array in use. This has been corrected. * md/list-objects-filter-memfix: list-objects-filter: correct usage of ALLOC_GROW by gitster
🛠️ Merge branch 'jt/partial-clone-missing-ref-delta-base' into maint "git fetch" into a lazy clone forgot to fetch base objects that are necessary to complete delta in a thin packfile, which has been corrected. * jt/partial-clone-missing-ref-delta-base: t5616: cover case of client having delta base t5616: use correct flag to check object is missing index-pack: prefetch missing REF_DELTA bases t5616: refactor packfile replacement by gitster
🛠️ Merge branch 'xl/record-partial-clone-origin' into maint When creating a partial clone, the object filtering criteria is recorded for the origin of the clone, but this incorrectly used a hardcoded name "origin" to name that remote; it has been corrected to honor the "--origin " option. * xl/record-partial-clone-origin: clone: respect user supplied origin name when setting up partial clone by gitster
🛠️ Merge branch 'pb/request-pull-verify-remote-ref' into maint "git request-pull" learned to warn when the ref we ask them to pull from in the local repository and in the published repository are different. * pb/request-pull-verify-remote-ref: request-pull: warn if the remote object is not the same as the local one request-pull: quote regex metacharacters in local ref by gitster
🛠️ Merge branch 'mm/p4-unshelve-windows-fix' into maint The command line to invoke a "git cat-file" command from inside "git p4" was not properly quoted to protect a caret and running a broken command on Windows, which has been corrected. * mm/p4-unshelve-windows-fix: p4 unshelve: fix "Not a valid object name HEAD0" on Windows by gitster
🛠️ Merge branch 'bb/unicode-12.1-reiwa' into maint Update to Unicode 12.1 width table. * bb/unicode-12.1-reiwa: unicode: update the width tables to Unicode 12.1 by gitster
🛠️ Merge branch 'js/fsmonitor-unflake' into maint The data collected by fsmonitor was not properly written back to the on-disk index file, breaking t7519 tests occasionally, which has been corrected. * js/fsmonitor-unflake: mark_fsmonitor_valid(): mark the index as changed if needed fill_stat_cache_info(): prepare for an fsmonitor fix by gitster
🛠️ Merge branch 'vv/merge-squash-with-explicit-commit' into maint "git merge --squash" is designed to update the working tree and the index without creating the commit, and this cannot be countermanded by adding the "--commit" option; the command now refuses to work when both options are given. * vv/merge-squash-with-explicit-commit: merge: refuse --commit with --squash by gitster
🛠️ Merge branch 'js/bundle-verify-require-object-store' into maint "git bundle verify" needs to see if prerequisite objects exist in the receiving repository, but the command did not check if we are in a repository upfront, which has been corrected. * js/bundle-verify-require-object-store: bundle verify: error out if called without an object database by gitster
🛠️ Merge branch 'jk/am-i-resolved-fix' into maint "git am -i --resolved" segfaulted after trying to see a commit as if it were a tree, which has been corrected. * jk/am-i-resolved-fix: am: fix --interactive HEAD tree resolution am: drop tty requirement for --interactive am: read interactive input from stdin am: simplify prompt response handling by gitster
🛠️ Merge branch 'jk/HEAD-symref-in-xfer-namespaces' into maint The server side support for "git fetch" used to show incorrect value for the HEAD symbolic ref when the namespace feature is in use, which has been corrected. * jk/HEAD-symref-in-xfer-namespaces: upload-pack: strip namespace from symref data by gitster
🛠️ Merge branch 'ew/server-info-remove-crufts' into maint "git update-server-info" used to leave stale packfiles in its output, which has been corrected. * ew/server-info-remove-crufts: server-info: do not list unlinked packs by gitster
🛠️ Merge branch 'es/grep-require-name-when-needed' into maint More parameter validation. * es/grep-require-name-when-needed: grep: fail if call could output and name is null by gitster
🛠️ Merge branch 'ds/object-info-for-prefetch-fix' into maint Code cleanup and futureproof. * ds/object-info-for-prefetch-fix: sha1-file: split OBJECT_INFO_FOR_PREFETCH by gitster
🛠️ Merge branch 'mh/import-transport-fd-fix' into maint The ownership rule for the file descriptor to fast-import remote backend was mixed up, leading to unrelated file descriptor getting closed, which has been fixed. * mh/import-transport-fd-fix: Use xmmap_gently instead of xmmap in use_pack dup() the input fd for fast-import used for remote helpers by gitster
🛠️ Merge branch 'nd/corrupt-worktrees' into maint "git worktree add" used to fail when another worktree connected to the same repository was corrupt, which has been corrected. * nd/corrupt-worktrees: worktree add: be tolerant of corrupt worktrees by gitster
🛠️ Merge branch 'nd/init-relative-template-fix' into maint A relative pathname given to "git init --template= " ought to be relative to the directory "git init" gets invoked in, but it instead was made relative to the repository, which has been corrected. * nd/init-relative-template-fix: init: make --template path relative to $CWD by gitster
🛠️ The seventh batch Signed-off-by: Junio C Hamano gitster@pobox.com by gitster
🛠️ Merge branch 'jk/test-commit-bulk' A test helper has been introduced to optimize preparation of test repositories with many simple commits, and a handful of test scripts have been updated to use it. * jk/test-commit-bulk: t6200: use test_commit_bulk t5703: use test_commit_bulk t5702: use test_commit_bulk t3311: use test_commit_bulk t5310: increase the number of bitmapped commits test-lib: introduce test_commit_bulk by gitster
🛠️ Merge branch 'di/readme-markup-fix' Docfix. * di/readme-markup-fix: README: fix rendering of text in angle brackets by gitster
🛠️ Merge branch 'jc/denoise-rm-to-resolve' "git rm" to resolve a conflicted path leaked an internal message "needs merge" before actually removing the path, which was confusing. This has been corrected. * jc/denoise-rm-to-resolve: rm: resolving by removal is not a warning-worthy event by gitster
🛠️ Merge branch 'js/clean-report-too-long-a-path' "git clean" silently skipped a path when it cannot lstat() it; now it gives a warning. * js/clean-report-too-long-a-path: clean: show an error message when the path is too long by gitster
🛠️ Merge branch 'tg/stash-keep-index-with-removed-paths' "git stash --keep-index" did not work correctly on paths that have been removed, which has been fixed. * tg/stash-keep-index-with-removed-paths: stash: fix handling removed files with --keep-index by gitster
🛠️ Merge branch 'sr/gpg-interface-stop-at-the-end' A codepath that reads from GPG for signed object verification read past the end of allocated buffer, which has been fixed. * sr/gpg-interface-stop-at-the-end: gpg-interface: do not scan past the end of buffer by gitster
🛠️ Merge branch 'js/mingw-spawn-with-spaces-in-path' Window 7 update ;-) * js/mingw-spawn-with-spaces-in-path: mingw: support spawning programs containing spaces in their names by gitster
🛠️ Merge branch 'jc/post-c89-rules-doc' We have been trying out a few language features outside c89; the coding guidelines document did not talk about them and instead had a blanket ban against them. * jc/post-c89-rules-doc: CodingGuidelines: spell out post-C89 rules by gitster
🛠️ Merge branch 'mt/dir-iterator-updates' Adjust the dir-iterator API and apply it to the local clone optimization codepath. * mt/dir-iterator-updates: clone: replace strcmp by fspathcmp clone: use dir-iterator to avoid explicit dir traversal clone: extract function from copy_or_link_directory clone: copy hidden paths at local clone dir-iterator: add flags parameter to dir_iterator_begin dir-iterator: refactor state machine model dir-iterator: use warning_errno when possible dir-iterator: add tests for dir-iterator API clone: better handle symlinked files at .git/objects/ clone: test for our behavior on odd objects/* content by gitster
🛠️ Merge branch 'vn/xmmap-gently' Clean-up an error codepath. * vn/xmmap-gently: read-cache.c: do not die if mmap fails by gitster
🛠️ Merge branch 'ac/log-use-mailmap-by-default-transition' The "git log" command learns to issue a warning when log.mailmap configuration is not set and --[no-]mailmap option is not used, to prepare users for future versions of Git that uses the mailmap by default. * ac/log-use-mailmap-by-default-transition: tests: defang pager tests by explicitly disabling the log.mailmap warning documentation: mention --no-use-mailmap and log.mailmap false setting log: add warning for unspecified log.mailmap setting by gitster
🛠️ Merge branch 'es/local-atomic-push-failure-with-http' "git push --atomic" that goes over the transport-helper (namely, the smart http transport) failed to prevent refs to be pushed when it can locally tell that one of the ref update will fail without having to consult the other end, which has been corrected. * es/local-atomic-push-failure-with-http: transport-helper: avoid var decl in for () loop control transport-helper: enforce atomic in push_refs_with_push by gitster
🛠️ Merge branch 'rm/gpg-program-doc-fix' Docfix. * rm/gpg-program-doc-fix: gpg(docs): use correct --verify syntax by gitster
🛠️ Merge branch 'js/unmap-before-ext-diff' Windows update. * js/unmap-before-ext-diff: diff: munmap() file contents before running external diff by gitster
🛠️ Merge branch 'tg/range-diff-output-update' "git range-diff" output has been tweaked for easier identification of which part of what file the patch shown is about. * tg/range-diff-output-update: range-diff: add headers to the outer hunk header range-diff: add filename to inner diff range-diff: add section header instead of diff header range-diff: suppress line count in outer diff range-diff: don't remove funcname from inner diff range-diff: split lines manually range-diff: fix function parameter indentation apply: make parse_git_diff_header public apply: only pass required data to gitdiff_* functions apply: only pass required data to find_name_* apply: only pass required data to check_header_line apply: only pass required data to git_header_name apply: only pass required data to skip_tree_prefix apply: replace marc.info link with public-inbox by gitster
🛠️ Merge branch 'ab/test-env' Many GIT_TEST_* environment variables control various aspects of how our tests are run, but a few followed "non-empty is true, empty or unset is false" while others followed the usual "there are a few ways to spell true, like yes, on, etc., and also ways to spell false, like no, off, etc." convention. * ab/test-env: env--helper: mark a file-local symbol as static tests: make GIT_TEST_FAIL_PREREQS a boolean tests: replace test_tristate with "git env--helper" tests README: re-flow a previously changed paragraph tests: make GIT_TEST_GETTEXT_POISON a boolean t6040 test: stop using global "script" variable config.c: refactor die_bad_number() to not call gettext() early env--helper: new undocumented builtin wrapping git_env_*() config tests: simplify include cycle test by gitster
🛠️ t6200: use test_commit_bulk There's a loop that creates 30 commits using test_commit. Using test_commit_bulk speeds this up from: Benchmark #1: ./t6200-fmt-merge-msg.sh --root=/var/ram/git-tests Time (mean ± σ): 1.926 s ± 0.240 s [User: 1.055 s, System: 0.963 s] Range (min … max): 1.431 s … 2.166 s 10 runs to: Benchmark #1: ./t6200-fmt-merge-msg.sh --root=/var/ram/git-tests Time (mean ± σ): 1.343 s ± 0.179 s [User: 766.5 ms, System: 662.9 ms] Range (min … max): 1.032 s … 1.664 s 10 runs for an average savings of over 30%. Signed-off-by: Jeff King peff@peff.net Signed-off-by: Junio C Hamano gitster@pobox.com by peff

---

CONTRIBUTORS

Last week there were 2 contributors.
👤 gitster
👤 peff

---

STARGAZERS

Last week there were no stargazers.

---

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. 📆