Skip to contentSkip to conversation

What's cooking in git.git (Jul 2022, #06; Tue, 19)

DISCUSSION Junio C Hamano 4 participants 4 messages Jul 20, 2022 – Jul 22, 2022

lore
Share & tools
lore
#0 lore raw

Here are the topics that have been cooking in my tree. Commits prefixed with '+' are in 'next' (being in 'next' is a sign that a topic is stable enough to be used and are candidate to be in a future release). Commits prefixed with '-' are only in 'seen', and aren't considered "accepted" at all.

Copies of the source code to Git live in many repositories, and the following is a list of the ones I push into or their mirrors. Some repositories have only a subset of branches.

With maint, master, next, seen, todo:

	git://git.kernel.org/pub/scm/git/git.git/
	git://repo.or.cz/alt-git.git/
	https://kernel.googlesource.com/pub/scm/git/git/
	https://github.com/git/git/
	https://gitlab.com/git-vcs/git/

With all the integration branches and topics broken out:

https://github.com/gitster/git/

Even though the preformatted documentation in HTML and man format are not sources, they are published in these repositories for convenience (replace "htmldocs" with "manpages" for the manual pages):

git://git.kernel.org/pub/scm/git/git-htmldocs.git/
https://github.com/gitster/git-htmldocs.git/

Release tarballs are available at:

https://www.kernel.org/pub/software/scm/git/

--------------------------------------------------
[New Topics]

* ds/midx-with-less-memory (2022-07-19) 3 commits
- midx: reduce memory pressure while writing bitmaps
- midx: extract bitmap write setup
- pack-bitmap-write: use const for hashes

The codepath to write multi-pack index has been taught to release a large chunk of memory that holds an array of objects in the packs, as soon as it is done with the array, to reduce memory consumption.

Will merge to 'next'?
source: <[email protected]>

* ma/sparse-checkout-cone-doc-fix (2022-07-18) 1 commit (merged to 'next' on 2022-07-19 at c259b61b0e)
+ config/core.txt: fix minor issues for core.sparseCheckoutCone

Docfix.

Will merge to 'master'.
source: <[email protected]>

* ma/t4200-update (2022-07-18) 1 commit
(merged to 'next' on 2022-07-19 at 710d0cafd9)
+ t4200: drop irrelevant code

Test fix.

Will merge to 'master'.
source: <[email protected]>

* mb/config-document-include (2022-07-17) 1 commit (merged to 'next' on 2022-07-19 at 8267b80aa2)
+ config.txt: document include, includeIf

Add missing documentation for "include" and "includeIf" features in "git config" file format, which incidentally teachs the command line completion to include them in its offerings.

Will merge to 'master'.
source: <[email protected]>

* sg/index-format-doc-update (2022-07-18) 1 commit (merged to 'next' on 2022-07-19 at ccc384be5e)
+ index-format.txt: remove outdated list of supported extensions

Docfix.

Will merge to 'master'.
source: <[email protected]>

* tl/pack-bitmap-error-messages (2022-07-18) 6 commits (merged to 'next' on 2022-07-19 at 3f9565653a)
+ pack-bitmap.c: continue looping when first MIDX bitmap is found
+ pack-bitmap.c: using error() instead of silently returning -1
+ pack-bitmap.c: do not ignore error when opening a bitmap file
+ pack-bitmap.c: rename "idx_name" to "bitmap_name"
+ pack-bitmap.c: mark more strings for translations
+ pack-bitmap.c: fix formatting of error messages

Tweak various messages that come from the pack-bitmap codepaths.

Will merge to 'master'.
source: <[email protected]>

* tl/trace2-config-scope (2022-07-18) 1 commit
- tr2: dump names if config exist in multiple scopes

Tweak trace2 output about configuration variables.

Expecting a reroll.
cf. <[email protected]>
source: <a01ae8478d3a8545241c5b064b6d369a330ee59f.1658159746.git.dyroneteng@gmail.com>

* vd/scalar-doc (2022-07-18) 2 commits
- scalar: convert README.md into a technical design doc
- scalar: reword command documentation to clarify purpose

Doc update.

Will merge to 'next'.
source: <[email protected]>

* cl/rerere-train-with-no-sign (2022-07-19) 1 commit
- contrib/rerere-train: avoid useless gpg sign in training

"rerere-train" script (in contrib/) used to honor commit.gpgSign while recreating the throw-away merges.

Will merge to 'next'.
source: <PH7PR14MB5594A27B9295E95ACA4D6A69CE8F9@PH7PR14MB5594.namprd14.prod.outlook.com>

* ds/win-syslog-compiler-fix (2022-07-19) 1 commit
- compat/win32: correct for incorrect compiler warning

Workaround for a false positive compiler warning.

Will merge to 'next'.
source: <[email protected]>

* ld/osx-keychain-usage-fix (2022-07-19) 1 commit
- osx-keychain: fix compiler warning

Workaround for a compiler warning against use of die() in osx-keychain (in contrib/).

Will merge to 'next'.
source: <[email protected]>

* ab/submodule-helper-leakfix (2022-07-19) 24 commits
- submodule--helper: fix a configure_added_submodule() leak
- submodule--helper: fix bad config API usage
- submodule--helper: free rest of "displaypath" in "struct update_data"
- submodule--helper: don't exit() on failure, return
- submodule--helper: add skeleton "goto cleanup" to update_submodule()
- submodule--helper: rename "int res" to "int ret"
- submodule--helper: free some "displaypath" in "struct update_data"
- submodule--helper: fix a memory leak in print_status()
- submodule--helper: fix a leak in module_add()
- submodule--helper: fix obscure leak in module_add()
- submodule--helper: fix "reference" leak is "module_clone_data"
- submodule--helper: fix a memory leak in get_default_remote_submodule()
- submodule--helper: fix a leak with repo_clear()
- submodule--helper: fix "sm_path" and other "module_cb_list" leaks
- submodule--helper: fix "errmsg_str" memory leak
- submodule--helper: refactor "errmsg_str" to be a "struct strbuf"
- submodule--helper: add and use *_release() functions
- submodule--helper: add "const" to copy of "update_data"
- submodule--helper: don't leak {run,capture}_command() cp.dir argument
- submodule--helper: "struct pathspec" memory leak in module_update()
- submodule--helper: fix most "struct pathspec" memory leaks
- submodule--helper: fix trivial get_default_remote_submodule() leak
- submodule--helper: fix a leak in "clone_submodule"
- submodule--helper: replace memset() with { 0 }-initialization

Plugging leaks in submodule--helper.

Needs review.
source: <[email protected]>

--------------------------------------------------
[Graduated to 'master']

* ab/build-gitweb (2022-06-28) 8 commits
(merged to 'next' on 2022-07-11 at 731e354ff0)
+ gitweb/Makefile: add a "NO_GITWEB" parameter
+ Makefile: build 'gitweb' in the default target
+ gitweb/Makefile: include in top-level Makefile
+ gitweb: remove "test" and "test-installed" targets
+ gitweb/Makefile: prepare to merge into top-level Makefile
+ gitweb/Makefile: clear up and de-duplicate the gitweb.{css,js} vars
+ gitweb/Makefile: add a $(GITWEB_ALL) variable
+ gitweb/Makefile: define all .PHONY prerequisites inline

Teach "make all" to build gitweb as well.
source: <[email protected]>

* ab/cocci-unused (2022-07-06) 6 commits
(merged to 'next' on 2022-07-11 at 7fa60d2a5b)
+ cocci: generalize "unused" rule to cover more than "strbuf"
+ cocci: add and apply a rule to find "unused" strbufs
+ cocci: have "coccicheck{,-pending}" depend on "coccicheck-test"
+ cocci: add a "coccicheck-test" target and test *.cocci rules
+ Makefile & .gitignore: ignore & clean "git.res", not "*.res"
+ Makefile: remove mandatory "spatch" arguments from SPATCH_FLAGS

Add Coccinelle rules to detect the pattern of initializing and then finalizing a structure without using it in between at all, which happens after code restructuring and the compilers fail to recognize as an unused variable.
source: <[email protected]>

* ab/leakfix (2022-07-01) 11 commits
(merged to 'next' on 2022-07-11 at 0b107fffcf)
+ pull: fix a "struct oid_array" memory leak
+ cat-file: fix a common "struct object_context" memory leak
+ gc: fix a memory leak
+ checkout: avoid "struct unpack_trees_options" leak
+ merge-file: fix memory leaks on error path
+ merge-file: refactor for subsequent memory leak fix
+ cat-file: fix a memory leak in --batch-command mode
+ revert: free "struct replay_opts" members
+ submodule.c: free() memory from xgetcwd()
+ clone: fix memory leak in wanted_peer_refs()
+ check-ref-format: fix trivial memory leak

Plug various memory leaks.
source: <[email protected]>

* ab/test-tool-leakfix (2022-07-01) 9 commits (merged to 'next' on 2022-07-11 at db7a724694)
+ test-tool delta: fix a memory leak
+ test-tool ref-store: fix a memory leak
+ test-tool bloom: fix memory leaks
+ test-tool json-writer: fix memory leaks
+ test-tool regex: call regfree(), fix memory leaks
+ test-tool urlmatch-normalization: fix a memory leak
+ test-tool {dump,scrap}-cache-tree: fix memory leaks
+ test-tool path-utils: fix a memory leak
+ test-tool test-hash: fix a memory leak

Plug various memory leaks in test-tool commands.
source: <[email protected]>

* ab/test-without-templates (2022-06-06) 7 commits (merged to 'next' on 2022-07-11 at afab6c1918)
+ tests: don't assume a .git/info for .git/info/sparse-checkout
+ tests: don't assume a .git/info for .git/info/exclude
+ tests: don't assume a .git/info for .git/info/refs
+ tests: don't assume a .git/info for .git/info/attributes
+ tests: don't assume a .git/info for .git/info/grafts
+ tests: don't depend on template-created .git/branches
+ t0008: don't rely on default ".git/info/exclude"

Tweak tests so that they still work when the "git init" template did not create .git/info directory.
source: <[email protected]>

* bc/nettle-sha256 (2022-07-10) 1 commit
(merged to 'next' on 2022-07-11 at cf9595d8ca)
+ sha256: add support for Nettle

Support for libnettle as SHA256 implementation has been added.
source: <[email protected]>

* en/merge-dual-dir-renames-fix (2022-07-06) 5 commits (merged to 'next' on 2022-07-11 at 5f8dadf87b)
+ merge-ort: fix issue with dual rename and add/add conflict
+ merge-ort: shuffle the computation and cleanup of potential collisions
+ merge-ort: make a separate function for freeing struct collisions
+ merge-ort: small cleanups of check_for_directory_rename
+ t6423: add tests of dual directory rename plus add/add conflict

Fixes a long-standing corner case bug around directory renames in the merge-ort strategy.
source: <[email protected]>

* fr/vimdiff-layout-fix (2022-07-08) 1 commit
(merged to 'next' on 2022-07-09 at d8461bd236)
+ vimdiff: make layout engine more robust against user vim settings

Recent update to vimdiff layout code has been made more robust against different end-user vim settings.
source: <[email protected]>

* gc/submodule-use-super-prefix (2022-06-30) 8 commits (merged to 'next' on 2022-07-11 at 0d9cf172f9)
+ submodule--helper: remove display path helper
+ submodule--helper update: use --super-prefix
+ submodule--helper: remove unused SUPPORT_SUPER_PREFIX flags
+ submodule--helper: use correct display path helper
+ submodule--helper: don't recreate recursive prefix
+ submodule--helper update: use display path helper
+ submodule--helper tests: add missing "display path" coverage
+ Merge branch 'ab/submodule-cleanup' into gc/submodule-use-super-prefix

Another step to rewrite more parts of "git submodule" in C.
source: <[email protected]>

* hx/lookup-commit-in-graph-fix (2022-07-12) 2 commits (merged to 'next' on 2022-07-13 at 4489696814)
+ t5330: remove run_with_limited_processses() (merged to 'next' on 2022-07-08 at cef32db0b6)
+ commit-graph.c: no lazy fetch in lookup_commit_in_graph()

A corner case bug where lazily fetching objects from a promisor remote resulted in infinite recursion has been corrected.
source: <[email protected]>

* jc/builtin-mv-move-array (2022-07-09) 1 commit (merged to 'next' on 2022-07-09 at 0d3b3f62e5)
+ builtin/mv.c: use the MOVE_ARRAY() macro instead of memmove()

Apply Coccinelle rule to turn raw memmove() into MOVE_ARRAY() cpp macro, which would improve maintainability and readability.
source: <[email protected]>

* jc/resolve-undo (2022-07-11) 2 commits
(merged to 'next' on 2022-07-13 at b9ef9482e8)
+ fsck: do not dereference NULL while checking resolve-undo data (merged to 'next' on 2022-06-15 at c195e5a2d9)
+ revision: mark blobs needed for resolve-undo as reachable

The resolve-undo information in the index was not protected against GC, which has been corrected.
source: <[email protected]>

* jd/gpg-interface-trust-level-string (2022-07-10) 1 commit (merged to 'next' on 2022-07-11 at 7b3cca73a8)
+ gpg-interface: add function for converting trust level to string

The code to convert between GPG trust level strings and internal constants we use to represent them have been cleaned up.
source: <[email protected]>

* jk/clone-unborn-confusion (2022-07-11) 4 commits (merged to 'next' on 2022-07-13 at a7ae8cb4b5)
+ clone: move unborn head creation to update_head()
+ clone: use remote branch if it matches default HEAD
+ clone: propagate empty remote HEAD even with other branches
+ clone: drop extra newline from warning message

"git clone" from a repository with some ref whose HEAD is unborn did not set the HEAD in the resulting repository correctly, which has been corrected.
source: <YsdyLS4UFzj0j/[email protected]>

* jk/diff-files-cleanup-fix (2022-07-12) 1 commit
(merged to 'next' on 2022-07-13 at 9db5235d01)
+ diff-files: move misplaced cleanup label

An earlier attempt to plug leaks placed a clean-up label to jump to at a bogus place, which as been corrected.
source: <Ys0c0ePxPOqZ/[email protected]>

* jk/ref-filter-discard-commit-buffer (2022-07-11) 1 commit (merged to 'next' on 2022-07-13 at d1521724db)
+ ref-filter: disable save_commit_buffer while traversing

Will merge to 'master'.
source: <[email protected]>

* ll/curl-accept-language (2022-07-11) 1 commit (merged to 'next' on 2022-07-13 at 076aba7421)
+ remote-curl: send Accept-Language header to server

Earlier, HTTP transport clients learned to tell the server side what locale they are in by sending Accept-Language HTTP header, but this was done only for some requests but not others.
source: <[email protected]>

* rs/cocci-array-copy (2022-07-10) 1 commit
(merged to 'next' on 2022-07-13 at f21dec0f71)
+ cocci: avoid normalization rules for memcpy

A coccinelle rule (in contrib/) to encourage use of COPY_ARRAY macro has been improved.
source: <[email protected]>

* sg/multi-pack-index-parse-options-fix (2022-07-10) 1 commit (merged to 'next' on 2022-07-11 at 1e14685680)
+ multi-pack-index: simplify handling of unknown --options

The way "git multi-pack" uses parse-options API has been improved.
source: <[email protected]>

--------------------------------------------------
[Stalled]

* bc/stash-export (2022-04-08) 4 commits
- builtin/stash: provide a way to import stashes from a ref
- builtin/stash: provide a way to export stashes to a ref
- builtin/stash: factor out revision parsing into a function
- object-name: make get_oid quietly return an error

A mechanism to export and import stash entries to and from a normal commit to transfer it across repositories has been introduced.

Expecting a reroll.
cf. <[email protected]>
source: <[email protected]>

* cw/remote-object-info (2022-05-06) 11 commits
- SQUASH??? coccicheck
- SQUASH??? ensure that coccicheck is happy
- SQUASH??? compilation fix
- cat-file: add --batch-command remote-object-info command
- cat-file: move parse_cmd and DEFAULT_FORMAT up
- transport: add object-info fallback to fetch
- transport: add client side capability to request object-info
- object-info: send attribute packet regardless of object ids
- object-store: add function to free object_info contents
- fetch-pack: move fetch default settings
- fetch-pack: refactor packet writing

A client component to talk with the object-info endpoint.

Expecting a reroll.
source: <[email protected]>

--------------------------------------------------
[Cooking]

* js/ci-github-workflow-markup (2022-07-14) 1 commit (merged to 'next' on 2022-07-15 at 196166f671)
+ tests: fix incorrect --write-junit-xml code

A fix for a regression in test framework.

Will merge to 'master'.
source: <[email protected]>

* js/shortlog-sort-stably (2022-07-14) 1 commit
(merged to 'next' on 2022-07-15 at 75e4efe678)
+ shortlog: use a stable sort

"git shortlog -n" relied on the underlying qsort() to be stable, which shouldn't have. Fixed.

Will merge to 'master'.
source: <[email protected]>

* mt/doc-config (2022-07-14) 3 commits
- doc: notes: unify configuration variables definitions
- doc: apply: unify configuration variables definitions
- doc: grep: unify configuration variables definitions

Unify description of configuration variables used by individual commands in the documentation of the commands and the documentation of the "git config".

Will discard (Retracted?).
cf. <CAHd-oW4zHA1YLX-5B1vYTA1f8PocziUCi0WxvSEkFUuf2GqKxg@mail.gmail.com>
source: <[email protected]>

* rs/mingw-tighten-mkstemp (2022-07-14) 1 commit (merged to 'next' on 2022-07-15 at 4dd4a117ec)
+ mingw: avoid mktemp() in mkstemp() implementation

mkstemp() emulation on Windows has been improved.

Will merge to 'master'.
source: <[email protected]>

* jt/fetch-pack-trace2-filter-spec (2022-07-18) 1 commit
- fetch-pack: write effective filter to trace2

"git fetch" client logs the partial clone filter used in the trace2 output.

Will merge to 'next'?
source: <[email protected]>

* mb/doc-rerere-autoupdate (2022-07-15) 1 commit
- cherry-pick doc: clarify no-rerere-autoupdate still allows rerere

Clarifies that the "--no-rerere-autoupdate" option does not disable the "rerere" mechanism (nor does "--rerere-autoupdate" enable it).

Will merge to 'next'?
source: <[email protected]>

* rs/mergesort (2022-07-17) 10 commits
- mergesort: remove llist_mergesort()
- packfile: use DEFINE_LIST_SORT
- fetch-pack: use DEFINE_LIST_SORT
- commit: use DEFINE_LIST_SORT
- blame: use DEFINE_LIST_SORT
- test-mergesort: use DEFINE_LIST_SORT
- test-mergesort: use DEFINE_LIST_SORT_DEBUG
- mergesort: add macros for typed sort of linked lists
- mergesort: tighten merge loop
- mergesort: unify ranks loops

Make our mergesort implementation type-safe.

Will merge to 'next'?
source: <[email protected]>

* cw/submodule-merge-messages (2022-07-18) 1 commit
- submodule merge: update conflict error message

Update the message given when "git merge" sees conflicts at a path with a submodule while merging a superproject.

Needs review.
source: <[email protected]>

* ds/doc-wo-whitelist (2022-07-19) 5 commits
- transport.c: avoid "whitelist"
- t: avoid "whitelist"
- git.txt: remove redundant language
- git-cvsserver: clarify directory list
- daemon: clarify directory arguments

Avoid "white/black-list" in documentation and code comments.

Will merge to 'next'.
source: <[email protected]>

* js/vimdiff-quotepath-fix (2022-07-14) 1 commit (merged to 'next' on 2022-07-15 at 4273bbd4b4)
+ mergetool(vimdiff): allow paths to contain spaces again

Variable quoting fix in the vimdiff driver of "git mergetool"

Will merge to 'master'.
source: <[email protected]>

* mt/checkout-count-fix (2022-07-14) 3 commits
- checkout: fix two bugs on the final count of updated entries
- checkout: show bug about failed entries being included in final report
- checkout: document bug where delayed checkout counts entries twice

"git checkout" miscounted the paths it updated, which has been corrected.

Will merge to 'next'?
source: <[email protected]>

* tb/commit-graph-genv2-upgrade-fix (2022-07-15) 3 commits
- commit-graph: fix corrupt upgrade from generation v1 to v2
- commit-graph: introduce repo_find_commit_pos_in_graph()
- t5318: demonstrate commit-graph generation v2 corruption

There was a bug in the codepath to upgrade generation information in commit-graph from v1 to v2 format, which has been corrected.

Will merge to 'next'?
source: <[email protected]>

* js/safe-directory-plus (2022-07-13) 3 commits
- mingw: be more informative when ownership check fails on FAT32
- mingw: handle a file owned by the Administrators group correctly
- Allow debugging unsafe directories' ownership

Needs review.
source: <[email protected]>

* po/doc-add-renormalize (2022-07-09) 1 commit
- doc add: renormalize is not idempotent for CRCRLF

Documentation for "git add --renormalize" has been improved.

Expecting a reroll.
cf. <[email protected]>
source: <d3b8ed97a105ea1d7e656c964b7eee378e11ede6.1657385781.git.gitgitgadget@gmail.com>

* po/glossary-around-traversal (2022-07-09) 3 commits
- glossary: add reachability bitmap description
- glossary: add commit graph description
- glossary: add Object DataBase (ODB) abbreviation

The glossary entries for "commit-graph file" and "reachability bitmap" have been added.

Expecting a reroll.
cf. <[email protected]>
source: <[email protected]>

* ac/bitmap-lookup-table (2022-07-06) 6 commits
- p5310-pack-bitmaps.sh: remove pack.writeReverseIndex
- bitmap-lookup-table: add performance tests for lookup table
- pack-bitmap: prepare to read lookup table extension
- pack-bitmap-write: learn pack.writeBitmapLookupTable and add tests
- pack-bitmap-write.c: write lookup table extension
- Documentation/technical: describe bitmap lookup table extension

The pack bitmap file gained a bitmap-lookup table to speed up locating the necessary bitmap for a given commit.

Waiting for a more thorough review.
cf. <[email protected]>
source: <[email protected]>

* kk/p4-client-name-encoding-fix (2022-07-08) 1 commit (merged to 'next' on 2022-07-11 at 9c18616f76)
+ git-p4: fix bug with encoding of p4 client name

"git p4" did not handle non-ASCII client name well, which has been corrected.

On hold, waiting for a follow-up.
cf. <[email protected]>
source: <[email protected]>

* sa/cat-file-mailmap (2022-07-18) 4 commits
- cat-file: add mailmap support
- ident: rename commit_rewrite_person() to apply_mailmap_to_header()
- ident: move commit_rewrite_person() to ident.c
- revision: improve commit_rewrite_person()

"git cat-file" learned an option to use the mailmap when showing commit and tag objects.

Will merge to 'next'?
source: <[email protected]>

* ds/rebase-update-ref (2022-07-19) 13 commits
- sequencer: notify user of --update-refs activity
- sequencer: ignore HEAD ref under --update-refs
- rebase: add rebase.updateRefs config option
- sequencer: rewrite update-refs as user edits todo list
- rebase: update refs from 'update-ref' commands
- rebase: add --update-refs option
- sequencer: add update-ref command
- sequencer: define array with enum values
- rebase-interactive: update 'merge' description
- branch: consider refs under 'update-refs'
- t2407: test branches currently using apply backend
- t2407: test bisect and rebase as black-boxes
- Merge branch 'ds/branch-checked-out' into ds/rebase-update-ref

"git rebase -i" learns to update branches whose tip appear in the rebased range.

Will merge to 'next'?
source: <[email protected]>

* pw/xdiff-alloc (2022-07-08) 4 commits
- xdiff: introduce XDL_ALLOC_GROW()
- xdiff: introduce XDL_CALLOC_ARRAY()
- xdiff: introduce xdl_calloc
- xdiff: introduce XDL_ALLOC_ARRAY()

Add a level of redirection to array allocation API in xdiff part, to make it easier to share with the libgit2 project.

Will merge to 'next'?
source: <[email protected]>

* ab/squelch-empty-fsync-traces (2022-07-18) 1 commit (merged to 'next' on 2022-07-19 at f77cd40c29)
+ trace2: only include "fsync" events if we git_fsync()

Omit fsync-related trace2 entries when their values are all zero.

Will merge to 'master'.
source: <[email protected]>

* en/merge-restore-to-pristine (2022-06-21) 6 commits
- merge: do not exit restore_state() prematurely
- merge: ensure we can actually restore pre-merge state
- merge: make restore_state() restore staged state too
- merge: fix save_state() to work when there are racy-dirty files
- merge: remove unused variable
- t6424: make sure a failed merge preserves local changes

When "git merge" finds that it cannot perform a merge, it should restore the working tree to the state before the command was initiated, but in some corner cases it didn't.

Under review.
source: <[email protected]>

* tk/apply-case-insensitive (2022-06-21) 3 commits
- apply: support case-only renames in case-insensitive filesystems
- reset: new failing test for reset of case-insensitive duplicate in index
- t4141: test "git apply" with core.ignorecase

"git apply" barfed on a patch that makes a case-only rename on a case-insensitive filesystem.

Needs review.
source: <[email protected]>

* zh/ls-files-format (2022-07-13) 1 commit
- ls-files: introduce "--format" option

"git ls-files" learns the "--format" option to tweak its output.

Will merge to 'next'?
source: <[email protected]>

* js/commit-graph-parsing-without-repo-settings (2022-07-14) 1 commit (merged to 'next' on 2022-07-19 at bcc29d823d)
+ commit-graph: pass repo_settings instead of repository

API tweak to make it easier to run fuzz testing on commit-graph parser.

Will merge to 'master'.
source: <fd70b6119153b165a62ee4f693dbe47031cfb2be.1657834657.git.steadmon@google.com>

* jt/connected-show-missing-from-which-side (2022-06-10) 1 commit
- fetch,fetch-pack: clarify connectivity check error

We may find an object missing after a "git fetch" stores the objects it obtained from the other side, but it is not necessarily because the remote failed to send necessary objects. Reword the messages in an attempt to help users explore other possibilities when they hit this error.

Expecting a reroll.
source: <[email protected]>

* tb/show-ref-count (2022-06-06) 2 commits
- builtin/show-ref.c: limit output with --count
- builtin/show-ref.c: rename found_match to matches_nr

"git show-ref" learned to stop after emitting N refs with the new "--count=N" option.

Expecting a reroll.
cf. <[email protected]>
source: <[email protected]>

* ds/bundle-uri-more (2022-06-06) 6 commits
- fetch: add 'refs/bundle/' to log.excludeDecoration
- bundle-uri: add support for http(s):// and file://
- fetch: add --bundle-uri option
- bundle-uri: create basic file-copy logic
- remote-curl: add 'get' capability
- docs: document bundle URI standard

The "bundle URI" topic.

Needs review.
source: <[email protected]>

* js/bisect-in-c (2022-06-27) 16 commits
- bisect: no longer try to clean up left-over .git/head-name files
- bisect: remove Cogito-related code
- Turn git bisect into a full built-in
- bisect: move even the command-line parsing to bisect--helper
- bisect: teach the bisect--helper command to show the correct usage strings
- bisect--helper: return only correct exit codes in cmd_*()
- bisect--helper: move the BISECT_STATE case to the end
- bisect--helper: make --bisect-state optional
- bisect--helper: align the sub-command order with git-bisect.sh
- bisect--helper: using --bisect-state without an argument is a bug
- bisect--helper: really retire --bisect-autostart
- bisect--helper: really retire --bisect-next-check
- bisect--helper: retire the --no-log option
- bisect: avoid double-quoting when printing the failed command
- bisect run: fix the error message
- bisect: verify that a bogus option won't try to start a bisection

Final bits of "git bisect.sh" have been rewritten in C.

Expecting a (hopefully final) reroll.
cf. <[email protected]>
source: <[email protected]>

* gc/bare-repo-discovery (2022-07-14) 5 commits (merged to 'next' on 2022-07-15 at 5206577852)
+ setup.c: create safe.bareRepository
+ safe.directory: use git_protected_config()
+ config: learn git_protected_config()
+ Documentation: define protected configuration
+ Documentation/git-config.txt: add SCOPES section

Introduce a discovery.barerepository configuration variable that allows users to forbid discovery of bare repositories.

Will merge to 'master'.
source: <[email protected]>

--------------------------------------------------
[Discarded]

* ar/send-email-confirm-by-default (2022-04-22) 1 commit . send-email: always confirm by default

"git send-email" is changed so that by default it asks for confirmation before sending each message out.

Discarded.
I wanted to like this, and had it in the version of Git I use myself for daily work, but the prompting turned out to be somewhat distracting.
source: <[email protected]>

#1 lore raw

ds/* (was Re: What's cooking in git.git (Jul 2022, #06; Tue, 19))

Quoted 11 lines · Junio C Hamano

* ds/midx-with-less-memory (2022-07-19) 3 commits
- midx: reduce memory pressure while writing bitmaps
- midx: extract bitmap write setup
- pack-bitmap-write: use const for hashes

The codepath to write multi-pack index has been taught to release a large chunk of memory that holds an array of objects in the packs, as soon as it is done with the array, to reduce memory consumption.

Will merge to 'next'?
source: <[email protected]>

The actual functional change is very small and safe. I don't expect significant edits to follow the latest version, but I'm happy to wait a few more days if someone wants to chime in.

Quoted 15 lines

* ds/rebase-update-ref (2022-07-19) 13 commits
- sequencer: notify user of --update-refs activity
- sequencer: ignore HEAD ref under --update-refs
- rebase: add rebase.updateRefs config option
- sequencer: rewrite update-refs as user edits todo list
- rebase: update refs from 'update-ref' commands
- rebase: add --update-refs option
- sequencer: add update-ref command
- sequencer: define array with enum values
- rebase-interactive: update 'merge' description
- branch: consider refs under 'update-refs'
- t2407: test branches currently using apply backend
- t2407: test bisect and rebase as black-boxes
- Merge branch 'ds/branch-checked-out' into ds/rebase-update-ref

Quoted 5 lines

"git rebase -i" learns to update branches whose tip appear in the rebased range.

Will merge to 'next'?
source: <[email protected]>

The most recent version was finally an iteration of small fixes, and not a rework of anything substantial. There are several things being saved for a possible follow-up, but I'm eager to see more people give this a try. I'll watch closely for any need to forward- fix anything in this area.

Thanks,
-Stolee

#2 lore raw

rs/mergesort (was: What's cooking in git.git (Jul 2022, #06; Tue, 19))

In reply to Junio C Hamano

Am 20.07.2022 um 03:20 schrieb Junio C Hamano:

Quoted 12 lines

* rs/mergesort (2022-07-17) 10 commits
- mergesort: remove llist_mergesort()
- packfile: use DEFINE_LIST_SORT
- fetch-pack: use DEFINE_LIST_SORT
- commit: use DEFINE_LIST_SORT
- blame: use DEFINE_LIST_SORT
- test-mergesort: use DEFINE_LIST_SORT
- test-mergesort: use DEFINE_LIST_SORT_DEBUG
- mergesort: add macros for typed sort of linked lists
- mergesort: tighten merge loop
- mergesort: unify ranks loops

Quoted 4 lines

Make our mergesort implementation type-safe.

Will merge to 'next'?
source: <[email protected]>

A confirmation that performance improves or at least doesn't get worse on other platforms as well would be a good. The numbers I gave in the commit messages were for macOS 12.4 on an M1.

I managed to install the Git SDK on a Windows 11 laptop with a Ryzen 5800H, and it gives me mixed results:

main:

0071.12: llist_mergesort() unsorted    0.69(0.01+0.03)
0071.14: llist_mergesort() sorted      0.42(0.03+0.04)
0071.16: llist_mergesort() reversed    0.41(0.01+0.04)

Benchmark 1: .\t\helper\test-tool mergesort test
Time (mean ± σ): 136.0 ms ± 1.8 ms [User: 0.7 ms, System: 3.8 ms]
Range (min … max): 132.9 ms … 140.4 ms 20 runs

After patch 1:

0071.12: llist_mergesort() unsorted    0.68(0.00+0.06)
0071.14: llist_mergesort() sorted      0.41(0.01+0.06)
0071.16: llist_mergesort() reversed    0.41(0.00+0.04)

Benchmark 1: .\t\helper\test-tool mergesort test
Time (mean ± σ): 137.8 ms ± 2.2 ms [User: 0.7 ms, System: 1.3 ms]
Range (min … max): 133.8 ms … 142.8 ms 20 runs

After patch 2:

0071.12: llist_mergesort() unsorted    0.69(0.00+0.04)
0071.14: llist_mergesort() sorted      0.41(0.00+0.04)
0071.16: llist_mergesort() reversed    0.41(0.00+0.07)

Benchmark 1: .\t\helper\test-tool mergesort test
Time (mean ± σ): 138.4 ms ± 3.1 ms [User: 2.9 ms, System: 1.9 ms]
Range (min … max): 134.3 ms … 144.0 ms 21 runs

After patch 5:

0071.12: DEFINE_LIST_SORT unsorted     0.70(0.01+0.04)
0071.14: DEFINE_LIST_SORT sorted       0.40(0.01+0.03)
0071.16: DEFINE_LIST_SORT reversed     0.40(0.00+0.04)

Benchmark 1: .\t\helper\test-tool mergesort test
Time (mean ± σ): 119.2 ms ± 2.3 ms [User: 0.6 ms, System: 2.7 ms]
Range (min … max): 115.8 ms … 124.1 ms 24 runs

So there's higher variance to begin with, and test-mergesort seems to be held back by something else than the sorting itself -- perhaps memory allocation or layout? Not a showstopper, I would say, but also not as nice a success story as given in the commit messages.

René

#3 lore raw

Re: rs/mergesort (was: What's cooking in git.git (Jul 2022, #06; Tue, 19))

Quoted 10 lines · René Scharfe

Am 20.07.2022 um 03:20 schrieb Junio C Hamano:

Quoted 1 line

* rs/mergesort (2022-07-17) 10 commits

A confirmation that performance improves or at least doesn't get worse on other platforms as well would be a good. The numbers I gave in the commit messages were for macOS 12.4 on an M1.

I managed to install the Git SDK on a Windows 11 laptop with a Ryzen 5800H, and it gives me mixed results:

FWIW, here are my measurements on a Core i7-8700T running Ubuntu 20.04:

On e72d93e88c (The fifth batch, 2022-07-19):

0071.12: llist_mergesort() unsorted    0.42(0.38+0.03)
0071.14: llist_mergesort() sorted      0.17(0.14+0.02)
0071.16: llist_mergesort() reversed    0.16(0.10+0.05)

Benchmark 1: t/helper/test-tool mergesort test
Time (mean ± σ): 143.9 ms ± 0.4 ms [User: 143.6 ms, System: 0.3 ms]
Range (min … max): 143.1 ms … 144.7 ms 20 runs

After patch 1 (mergesort: unify ranks loops):

0071.12: llist_mergesort() unsorted    0.41(0.36+0.05)
0071.14: llist_mergesort() sorted      0.17(0.12+0.05)
0071.16: llist_mergesort() reversed    0.16(0.12+0.04)

Benchmark 1: t/helper/test-tool mergesort test
Time (mean ± σ): 141.5 ms ± 0.5 ms [User: 141.1 ms, System: 0.5 ms]
Range (min … max): 141.0 ms … 142.9 ms 21 runs

After patch 2 (mergesort: tighten merge loop):

0071.12: llist_mergesort() unsorted    0.42(0.39+0.03)
0071.14: llist_mergesort() sorted      0.17(0.10+0.06)
0071.16: llist_mergesort() reversed    0.16(0.11+0.04)

Benchmark 1: t/helper/test-tool mergesort test
Time (mean ± σ): 142.6 ms ± 0.9 ms [User: 142.1 ms, System: 0.6 ms]
Range (min … max): 141.9 ms … 145.3 ms 21 runs

After patch 5 (test-mergesort: use DEFINE_LIST_SORT):

0071.12: DEFINE_LIST_SORT unsorted     0.40(0.35+0.04)
0071.14: DEFINE_LIST_SORT sorted       0.16(0.11+0.04)
0071.16: DEFINE_LIST_SORT reversed     0.16(0.11+0.05)

Benchmark 1: t/helper/test-tool mergesort test
Time (mean ± σ): 123.3 ms ± 0.5 ms [User: 123.0 ms, System: 0.4 ms]
Range (min … max): 122.7 ms … 125.2 ms 23 runs

Martin