mirror of
https://github.com/git/git.git
synced 2026-01-12 13:53:11 +09:00
What's cooking (2022/09 #04)
This commit is contained in:
parent
dc474fafc7
commit
b13b9e0158
@ -1,9 +1,9 @@
|
||||
To: git@vger.kernel.org
|
||||
Subject: What's cooking in git.git (Sep 2022, #03; Tue, 13)
|
||||
X-master-at: e188ec3a735ae52a0d0d3c22f9df6b29fa613b1e
|
||||
X-next-at: b38f19008aff4c52573f00da5d2d3bfd3877fcfc
|
||||
Subject: What's cooking in git.git (Sep 2022, #04; Thu, 15)
|
||||
X-master-at: d3fa443f97e3a8d75b51341e2d5bac380b7422df
|
||||
X-next-at: 21cbab75150d71ca294e09180c59ee529ca53957
|
||||
|
||||
What's cooking in git.git (Sep 2022, #03; Tue, 13)
|
||||
What's cooking in git.git (Sep 2022, #04; Thu, 15)
|
||||
--------------------------------------------------
|
||||
|
||||
Here are the topics that have been cooking in my tree. Commits
|
||||
@ -13,12 +13,11 @@ release). Commits prefixed with '-' are only in 'seen', and aren't
|
||||
considered "accepted" at all. A topic without enough support may be
|
||||
discarded after a long period of no activity.
|
||||
|
||||
It is expected to be a bit slower week than usual, as many of our
|
||||
contributors are flying to Chicago and back, with a bit of fun in
|
||||
the conference in between. We'll tag the first release candidate
|
||||
next week (cf. https://tinyurl.com/gitCal), and it will hopefully
|
||||
start to become even quieter after that, with only regression fixes
|
||||
and nothing else.
|
||||
I tagged the tip of the 'master' branch as 2.38-rc0, aka "preview",
|
||||
but since many folks are away attending Git Merge, expect not much
|
||||
activity on the release. The first "release candidate" that signals
|
||||
the start of pre-release feature freeze is scheduled to happen mid
|
||||
next week (cf. http://tinyurl.com/gitCal).
|
||||
|
||||
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
|
||||
@ -51,152 +50,115 @@ Release tarballs are available at:
|
||||
--------------------------------------------------
|
||||
[Graduated to 'master']
|
||||
|
||||
* ab/submodule-helper-prep (2022-09-02) 33 commits
|
||||
(merged to 'next' on 2022-09-05 at b0d1b6ada7)
|
||||
+ submodule--helper: fix bad config API usage
|
||||
+ submodule--helper: libify even more "die" paths for module_update()
|
||||
+ submodule--helper: libify more "die" paths for module_update()
|
||||
+ submodule--helper: check repo{_submodule,}_init() return values
|
||||
+ submodule--helper: libify "must_die_on_failure" code paths (for die)
|
||||
+ submodule--helper update: don't override 'checkout' exit code
|
||||
+ submodule--helper: libify "must_die_on_failure" code paths
|
||||
+ submodule--helper: libify determine_submodule_update_strategy()
|
||||
+ submodule--helper: don't exit() on failure, return
|
||||
+ submodule--helper: use "code" in run_update_command()
|
||||
+ submodule API: don't handle SM_..{UNSPECIFIED,COMMAND} in to_string()
|
||||
+ submodule--helper: don't call submodule_strategy_to_string() in BUG()
|
||||
+ submodule--helper: add missing braces to "else" arm
|
||||
+ submodule--helper: return "ret", not "1" from update_submodule()
|
||||
+ submodule--helper: rename "int res" to "int ret"
|
||||
+ submodule--helper: don't redundantly check "else if (res)"
|
||||
+ submodule--helper: refactor "errmsg_str" to be a "struct strbuf"
|
||||
+ submodule--helper: add "const" to passed "struct update_data"
|
||||
+ submodule--helper: add "const" to copy of "update_data"
|
||||
+ submodule--helper: add "const" to passed "module_clone_data"
|
||||
+ submodule--helper: move "sb" in clone_submodule() to its own scope
|
||||
+ submodule--helper: use xstrfmt() in clone_submodule()
|
||||
+ submodule--helper: replace memset() with { 0 }-initialization
|
||||
+ submodule--helper style: add \n\n after variable declarations
|
||||
+ submodule--helper style: don't separate declared variables with \n\n
|
||||
+ submodule--helper: move "resolve-relative-url-test" to a test-tool
|
||||
+ submodule--helper: move "check-name" to a test-tool
|
||||
+ submodule--helper: move "is-active" to a test-tool
|
||||
+ test-tool submodule-config: remove unused "--url" handling
|
||||
+ submodule--helper: remove unused "list" helper
|
||||
+ submodule--helper: remove unused "name" helper
|
||||
+ submodule tests: test for "add <repository> <abs-path>"
|
||||
+ submodule tests: test usage behavior
|
||||
(this branch is used by ab/submodule-helper-leakfix.)
|
||||
* ab/dedup-config-and-command-docs (2022-09-07) 9 commits
|
||||
(merged to 'next' on 2022-09-08 at cd5b217110)
|
||||
+ docs: add CONFIGURATION sections that fuzzy map to built-ins
|
||||
+ docs: add CONFIGURATION sections that map to a built-in
|
||||
+ log docs: de-duplicate configuration sections
|
||||
+ difftool docs: de-duplicate configuration sections
|
||||
+ notes docs: de-duplicate and combine configuration sections
|
||||
+ apply docs: de-duplicate configuration sections
|
||||
+ send-email docs: de-duplicate configuration sections
|
||||
+ grep docs: de-duplicate configuration sections
|
||||
+ docs: add and use include template for config/* includes
|
||||
|
||||
Code clean-up of "git submodule--helper".
|
||||
source: <cover-v4-00.33-00000000000-20220831T230519Z-avarab@gmail.com>
|
||||
Share the text used to explain configuration variables used by "git
|
||||
<subcmd>" in "git help <subcmd>" with the text from "git help config".
|
||||
cf. <CAHd-oW71qvhG16YtMweA26SDCLKn+LHZe13njn18CD==9Ewbnw@mail.gmail.com>
|
||||
source: <cover-v4-0.9-00000000000-20220907T082419Z-avarab@gmail.com>
|
||||
|
||||
|
||||
* ed/fsmonitor-on-network-disk (2022-08-11) 1 commit
|
||||
(merged to 'next' on 2022-08-14 at 637d458d9c)
|
||||
+ fsmonitor: option to allow fsmonitor to run against network-mounted repos
|
||||
* ab/submodule-helper-leakfix (2022-09-02) 18 commits
|
||||
(merged to 'next' on 2022-09-08 at bf21cfed4b)
|
||||
+ submodule--helper: fix a configure_added_submodule() leak
|
||||
+ submodule--helper: free rest of "displaypath" in "struct update_data"
|
||||
+ 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
|
||||
+ 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: add and use *_release() functions
|
||||
+ 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"
|
||||
+ Merge branch 'ab/submodule-helper-prep' into ab/submodule-helper-leakfix
|
||||
|
||||
The built-in fsmonitor refuses to work on a network mounted
|
||||
repositories; a configuration knob for users to override this has
|
||||
been introduced.
|
||||
source: <pull.1317.v4.git.1660262231357.gitgitgadget@gmail.com>
|
||||
Plugging leaks in submodule--helper.
|
||||
source: <cover-v7-00.17-00000000000-20220831T231003Z-avarab@gmail.com>
|
||||
|
||||
|
||||
* jk/rev-list-verify-objects-fix (2022-09-07) 2 commits
|
||||
(merged to 'next' on 2022-09-07 at 5da58e2145)
|
||||
+ rev-list: disable commit graph with --verify-objects
|
||||
+ lookup_commit_in_graph(): use prepare_commit_graph() to check for graph
|
||||
* ab/unused-annotation (2022-09-01) 2 commits
|
||||
(merged to 'next' on 2022-09-08 at dfc6123c6b)
|
||||
+ git-compat-util.h: use "deprecated" for UNUSED variables
|
||||
+ git-compat-util.h: use "UNUSED", not "UNUSED(var)"
|
||||
(this branch uses jk/unused-annotation.)
|
||||
|
||||
"git rev-list --verify-objects" ought to inspect the contents of
|
||||
objects and notice corrupted ones, but it didn't when the commit
|
||||
graph is in use, which has been corrected.
|
||||
source: <Yxe0k++LA/UfFLF/@coredump.intra.peff.net>
|
||||
Undoes 'jk/unused-annotation' topic and redoes it to work around
|
||||
Coccinelle rules misfiring false positives in unrelated codepaths.
|
||||
source: <cover-0.2-00000000000-20220825T170709Z-avarab@gmail.com>
|
||||
|
||||
|
||||
* jk/upload-pack-skip-hash-check (2022-09-07) 4 commits
|
||||
(merged to 'next' on 2022-09-07 at f638a5a7c9)
|
||||
+ t1060: check partial clone of misnamed blob
|
||||
+ parse_object(): check commit-graph when skip_hash set
|
||||
+ upload-pack: skip parse-object re-hashing of "want" objects
|
||||
+ parse_object(): allow skipping hash check
|
||||
* en/remerge-diff-fixes (2022-09-02) 3 commits
|
||||
(merged to 'next' on 2022-09-12 at 9879cec049)
|
||||
+ diff: fix filtering of merge commits under --remerge-diff
|
||||
+ diff: fix filtering of additional headers under --remerge-diff
|
||||
+ diff: have submodule_format logic avoid additional diff headers
|
||||
|
||||
The server side that responds to "git fetch" and "git clone"
|
||||
request has been optimized by allowing it to send objects in its
|
||||
object store without recomputing and validating the object names.
|
||||
source: <YxfQi4qg8uJHs7Gp@coredump.intra.peff.net>
|
||||
source: <YxkAxutS+B8//0WF@coredump.intra.peff.net>
|
||||
Fix a few "git log --remerge-diff" bugs.
|
||||
source: <pull.1342.v3.git.1662090810.gitgitgadget@gmail.com>
|
||||
|
||||
|
||||
* js/builtin-add-p-portability-fix (2022-08-30) 3 commits
|
||||
(merged to 'next' on 2022-09-08 at 8d3e72e890)
|
||||
+ t6132(NO_PERL): do not run the scripted `add -p`
|
||||
+ t3701: test the built-in `add -i` regardless of NO_PERL
|
||||
+ add -p: avoid ambiguous signed/unsigned comparison
|
||||
* jk/plug-list-object-filter-leaks (2022-09-08) 5 commits
|
||||
(merged to 'next' on 2022-09-08 at a6b4b080e4)
|
||||
+ prepare_repo_settings(): plug leak of config values
|
||||
+ list_objects_filter_options: plug leak of filter_spec strings
|
||||
+ transport: free filter options in disconnect_git()
|
||||
+ transport: deep-copy object-filter struct for fetch-pack
|
||||
+ list_objects_filter_copy(): deep-copy sparse_oid_name field
|
||||
(this branch is used by jk/list-objects-filter-cleanup.)
|
||||
|
||||
More fixes to "add -p"
|
||||
source: <pull.1340.git.1661867664.gitgitgadget@gmail.com>
|
||||
The code that manages list-object-filter structure, used in partial
|
||||
clones, leaked the instances, which has been plugged.
|
||||
source: <Yxl1BNQoy6Drf0Oe@coredump.intra.peff.net>
|
||||
|
||||
|
||||
* ow/rev-parse-parseopt-fix (2022-09-08) 1 commit
|
||||
(merged to 'next' on 2022-09-08 at a15efb3478)
|
||||
+ rev-parse --parseopt: detect missing opt-spec
|
||||
* jk/proto-v2-ref-prefix-fix (2022-09-08) 2 commits
|
||||
(merged to 'next' on 2022-09-12 at 70c5528b86)
|
||||
+ fetch: add branch.*.merge to default ref-prefix extension
|
||||
+ fetch: stop checking for NULL transport->remote in do_fetch()
|
||||
|
||||
The parser in the script interface to parse-options in "git
|
||||
rev-parse" has been updated to diagnose a bogus input correctly.
|
||||
source: <20220902175902.22346-1-oystwa@gmail.com>
|
||||
"git fetch" over protocol v2 sent an incorrect ref prefix request
|
||||
to the server and made "git pull" with configured fetch refspec
|
||||
that does not cover the remote branch to merge with fail, which has
|
||||
been corrected.
|
||||
source: <YxpBMaIckimFJYEi@coredump.intra.peff.net>
|
||||
|
||||
|
||||
* rs/diff-no-index-cleanup (2022-09-07) 3 commits
|
||||
(merged to 'next' on 2022-09-07 at a305340e6f)
|
||||
+ diff-no-index: simplify argv index calculation
|
||||
+ diff-no-index: release prefixed filenames
|
||||
+ diff-no-index: release strbuf on queue error
|
||||
(this branch is used by jc/diff-no-index-two-stdin.)
|
||||
* jk/unused-annotation (2022-08-19) 11 commits
|
||||
(merged to 'next' on 2022-08-24 at 2174b8c75d)
|
||||
+ is_path_owned_by_current_uid(): mark "report" parameter as unused
|
||||
+ run-command: mark unused async callback parameters
|
||||
+ mark unused read_tree_recursive() callback parameters
|
||||
+ hashmap: mark unused callback parameters
|
||||
+ config: mark unused callback parameters
|
||||
+ streaming: mark unused virtual method parameters
|
||||
+ transport: mark bundle transport_options as unused
|
||||
+ refs: mark unused virtual method parameters
|
||||
+ refs: mark unused reflog callback parameters
|
||||
+ refs: mark unused each_ref_fn parameters
|
||||
+ git-compat-util: add UNUSED macro
|
||||
(this branch is used by ab/unused-annotation.)
|
||||
|
||||
"git diff --no-index A B" managed its the pathnames of its two
|
||||
input files rather haphazardly, sometimes leaking them. The
|
||||
command line argument processing has been straightened out to clean
|
||||
it up.
|
||||
source: <xmqq8rmx1saz.fsf@gitster.g>
|
||||
|
||||
|
||||
* sg/parse-options-subcommand (2022-09-07) 5 commits
|
||||
(merged to 'next' on 2022-09-07 at e71f9b1de6)
|
||||
+ notes, remote: show unknown subcommands between `'
|
||||
+ notes: simplify default operation mode arguments check
|
||||
+ test-parse-options.c: fix style of comparison with zero
|
||||
+ test-parse-options.c: don't use for loop initial declaration
|
||||
+ t0040-parse-options: remove leftover debugging
|
||||
|
||||
The codepath for the OPT_SUBCOMMAND facility has been cleaned up.
|
||||
source: <20220905185007.9042-1-szeder.dev@gmail.com>
|
||||
|
||||
--------------------------------------------------
|
||||
[New Topics]
|
||||
|
||||
* jk/list-objects-filter-cleanup (2022-09-12) 5 commits
|
||||
(merged to 'next' on 2022-09-12 at 33cb79c924)
|
||||
+ list-objects-filter: convert filter_spec to a strbuf
|
||||
+ list-objects-filter: add and use initializers
|
||||
+ list-objects-filter: handle null default filter spec
|
||||
+ list-objects-filter: don't memset after releasing filter struct
|
||||
+ Merge branch 'jk/plug-list-object-filter-leaks' into jk/list-objects-filter-cleanup
|
||||
(this branch uses jk/plug-list-object-filter-leaks.)
|
||||
|
||||
A couple of bugfixes with code clean-up.
|
||||
|
||||
Will merge to 'master'.
|
||||
source: <Yx1qwlpNbxGEiUgc@coredump.intra.peff.net>
|
||||
|
||||
|
||||
* zh/ls-files-format (2022-09-12) 1 commit
|
||||
(merged to 'next' on 2022-09-12 at 91dda58387)
|
||||
+ ls-files: fix black space in error message
|
||||
|
||||
Typofix in the UI of a topic that has graduated to 'master'.
|
||||
|
||||
Will merge to 'master'.
|
||||
source: <pull.1350.git.1662904997760.gitgitgadget@gmail.com>
|
||||
Annotate function parameters that are not used (but cannot be
|
||||
removed for structural reasons), to prepare us to later compile
|
||||
with -Wunused warning turned on.
|
||||
source: <Yv9gxqH6nK2KYnNj@coredump.intra.peff.net>
|
||||
|
||||
|
||||
* js/typofix (2022-09-12) 1 commit
|
||||
@ -204,9 +166,96 @@ Release tarballs are available at:
|
||||
+ Documentation: fix various repeat word typos
|
||||
|
||||
Typofix.
|
||||
source: <20220911102320.39954-2-jacob@initialcommit.io>
|
||||
|
||||
|
||||
* rs/add-p-worktree-mode-prompt-fix (2022-09-14) 1 commit
|
||||
(merged to 'next' on 2022-09-14 at 5f29a569d4)
|
||||
+ add -p: fix worktree patch mode prompts
|
||||
|
||||
Fix another UI regression in the reimplemented "add -p".
|
||||
source: <2463c4b9-313b-032f-9313-d1421f71f111@web.de>
|
||||
|
||||
--------------------------------------------------
|
||||
[New Topics]
|
||||
|
||||
* ed/fsmonitor-on-networked-macos (2022-09-13) 5 commits
|
||||
- fsmonitor: add documentation for allowRemote and socketDir options
|
||||
- fsmonitor: deal with synthetic firmlinks on macOS
|
||||
- fsmonitor: avoid socket location check if using hook
|
||||
- fsmonitor: relocate socket file if .git directory is remote
|
||||
- fsmonitor: refactor filesystem checks to common interface
|
||||
|
||||
By default, use of fsmonitor on a repository on networked
|
||||
filesystem is disabled. Add knobs to make it workable on macOS.
|
||||
|
||||
Needs review.
|
||||
source: <pull.1326.v6.git.1663100858.gitgitgadget@gmail.com>
|
||||
|
||||
|
||||
* rj/branch-edit-description-with-nth-checkout (2022-09-12) 2 commits
|
||||
- branch: support for shortcuts like @{-1} completed
|
||||
- branch: refactor "edit_description" code path
|
||||
|
||||
"git branch --edit-description @{-1}" is now a way to edit branch
|
||||
description of the branch you were on before switching to the
|
||||
current branch.
|
||||
|
||||
Needs review.
|
||||
source: <7abdb5a9-5707-7897-4196-8d2892beeb81@gmail.com>
|
||||
|
||||
|
||||
* mj/credential-helper-auth-headers (2022-09-13) 8 commits
|
||||
- http: set specific auth scheme depending on credential
|
||||
- http: move proactive auth to first slot creation
|
||||
- http: store all request headers on active_request_slot
|
||||
- credential: add WWW-Authenticate header to cred requests
|
||||
- http: read HTTP WWW-Authenticate response headers
|
||||
- osxkeychain: clarify that we ignore unknown lines
|
||||
- netrc: ignore unknown lines (do not die)
|
||||
- wincred: ignore unknown lines (do not die)
|
||||
|
||||
RFC
|
||||
source: <pull.1352.git.1663097156.gitgitgadget@gmail.com>
|
||||
|
||||
|
||||
* ec/reftable-pass-pq-entry-by-reference (2022-09-15) 1 commit
|
||||
(merged to 'next' on 2022-09-15 at 928e75c7d1)
|
||||
+ reftable: use a pointer for pq_entry param
|
||||
|
||||
Small code clean-up in reftable implementation.
|
||||
|
||||
Will merge to 'master'.
|
||||
source: <20220911102320.39954-2-jacob@initialcommit.io>
|
||||
source: <1833f3928cb.acf3c97d869879.7909589521159235166@elijahpepe.com>
|
||||
|
||||
|
||||
* jc/environ-docs (2022-09-15) 5 commits
|
||||
- environ: GIT_INDEX_VERSION affects not just a new repository
|
||||
- environ: simplify description of GIT_INDEX_FILE
|
||||
- environ: GIT_FLUSH should be made a usual Boolean
|
||||
- environ: explain Boolean environment variables
|
||||
- environ: document GIT_SSL_NO_VERIFY
|
||||
|
||||
Documentation on various Boolean GIT_* environment variables have
|
||||
been clarified.
|
||||
|
||||
Needs review.
|
||||
source: <20220915160659.126441-1-gitster@pobox.com>
|
||||
|
||||
|
||||
* rs/diff-caret-bang-with-parents (2022-09-15) 6 commits
|
||||
- revision: add parents after child for ^!
|
||||
- revision: rename add_parents_only() to add_nth_parent()
|
||||
- revision: factor out add_parents()
|
||||
- revision: factor out add_parent()
|
||||
- revision: factor out get_commit()
|
||||
- revision: use strtol_i() for exclude_parent
|
||||
|
||||
"git diff rev^!" did not show combined diff to go to the rev from
|
||||
its parents.
|
||||
|
||||
Needs review.
|
||||
source: <ba6eea28-fb3a-b376-2529-351727c02f1a@web.de>
|
||||
|
||||
--------------------------------------------------
|
||||
[Stalled]
|
||||
@ -252,6 +301,30 @@ Release tarballs are available at:
|
||||
--------------------------------------------------
|
||||
[Cooking]
|
||||
|
||||
* jk/list-objects-filter-cleanup (2022-09-12) 5 commits
|
||||
(merged to 'next' on 2022-09-12 at 33cb79c924)
|
||||
+ list-objects-filter: convert filter_spec to a strbuf
|
||||
+ list-objects-filter: add and use initializers
|
||||
+ list-objects-filter: handle null default filter spec
|
||||
+ list-objects-filter: don't memset after releasing filter struct
|
||||
+ Merge branch 'jk/plug-list-object-filter-leaks' into jk/list-objects-filter-cleanup
|
||||
|
||||
A couple of bugfixes with code clean-up.
|
||||
|
||||
Will merge to 'master'.
|
||||
source: <Yx1qwlpNbxGEiUgc@coredump.intra.peff.net>
|
||||
|
||||
|
||||
* zh/ls-files-format (2022-09-12) 1 commit
|
||||
(merged to 'next' on 2022-09-12 at 91dda58387)
|
||||
+ ls-files: fix black space in error message
|
||||
|
||||
Typofix in the UI of a topic that has graduated to 'master'.
|
||||
|
||||
Will merge to 'master'.
|
||||
source: <pull.1350.git.1662904997760.gitgitgadget@gmail.com>
|
||||
|
||||
|
||||
* ab/doc-synopsis-and-cmd-usage (2022-09-07) 34 commits
|
||||
- tests: start asserting that *.txt SYNOPSIS matches -h output
|
||||
- doc txt & -h consistency: make "worktree" consistent
|
||||
@ -296,36 +369,6 @@ Release tarballs are available at:
|
||||
source: <cover-00.34-00000000000-20220902T092734Z-avarab@gmail.com>
|
||||
|
||||
|
||||
* jk/plug-list-object-filter-leaks (2022-09-08) 5 commits
|
||||
(merged to 'next' on 2022-09-08 at a6b4b080e4)
|
||||
+ prepare_repo_settings(): plug leak of config values
|
||||
+ list_objects_filter_options: plug leak of filter_spec strings
|
||||
+ transport: free filter options in disconnect_git()
|
||||
+ transport: deep-copy object-filter struct for fetch-pack
|
||||
+ list_objects_filter_copy(): deep-copy sparse_oid_name field
|
||||
(this branch is used by jk/list-objects-filter-cleanup.)
|
||||
|
||||
The code that manages list-object-filter structure, used in partial
|
||||
clones, leaked the instances, which has been plugged.
|
||||
|
||||
Will merge to 'master'.
|
||||
source: <Yxl1BNQoy6Drf0Oe@coredump.intra.peff.net>
|
||||
|
||||
|
||||
* jk/proto-v2-ref-prefix-fix (2022-09-08) 2 commits
|
||||
(merged to 'next' on 2022-09-12 at 70c5528b86)
|
||||
+ fetch: add branch.*.merge to default ref-prefix extension
|
||||
+ fetch: stop checking for NULL transport->remote in do_fetch()
|
||||
|
||||
"git fetch" over protocol v2 sent an incorrect ref prefix request
|
||||
to the server and made "git pull" with configured fetch refspec
|
||||
that does not cover the remote branch to merge with fail, which has
|
||||
been corrected.
|
||||
|
||||
Will merge to 'master'.
|
||||
source: <YxpBMaIckimFJYEi@coredump.intra.peff.net>
|
||||
|
||||
|
||||
* vd/doc-reviewing-guidelines (2022-09-09) 1 commit
|
||||
- Documentation: add ReviewingGuidelines
|
||||
|
||||
@ -336,19 +379,6 @@ Release tarballs are available at:
|
||||
source: <pull.1348.git.1662747205235.gitgitgadget@gmail.com>
|
||||
|
||||
|
||||
* ab/unused-annotation (2022-09-01) 2 commits
|
||||
(merged to 'next' on 2022-09-08 at dfc6123c6b)
|
||||
+ git-compat-util.h: use "deprecated" for UNUSED variables
|
||||
+ git-compat-util.h: use "UNUSED", not "UNUSED(var)"
|
||||
(this branch uses jk/unused-annotation.)
|
||||
|
||||
Undoes 'jk/unused-annotation' topic and redoes it to work around
|
||||
Coccinelle rules misfiring false positives in unrelated codepaths.
|
||||
|
||||
Will merge to 'master'.
|
||||
source: <cover-0.2-00000000000-20220825T170709Z-avarab@gmail.com>
|
||||
|
||||
|
||||
* ab/coccicheck-incremental (2022-08-31) 9 commits
|
||||
- spatchcache: add a ccache-alike for "spatch"
|
||||
- cocci: optimistically use COMPUTE_HEADER_DEPENDENCIES
|
||||
@ -367,18 +397,6 @@ Release tarballs are available at:
|
||||
source: <cover-v2-0.9-00000000000-20220831T205130Z-avarab@gmail.com>
|
||||
|
||||
|
||||
* en/remerge-diff-fixes (2022-09-02) 3 commits
|
||||
(merged to 'next' on 2022-09-12 at 9879cec049)
|
||||
+ diff: fix filtering of merge commits under --remerge-diff
|
||||
+ diff: fix filtering of additional headers under --remerge-diff
|
||||
+ diff: have submodule_format logic avoid additional diff headers
|
||||
|
||||
Fix a few "git log --remerge-diff" bugs.
|
||||
|
||||
Will merge to 'master'.
|
||||
source: <pull.1342.v3.git.1662090810.gitgitgadget@gmail.com>
|
||||
|
||||
|
||||
* es/chainlint (2022-09-12) 19 commits
|
||||
(merged to 'next' on 2022-09-12 at 577e59143f)
|
||||
+ chainlint: colorize problem annotations and test delimiters
|
||||
@ -410,44 +428,43 @@ Release tarballs are available at:
|
||||
|
||||
|
||||
* vd/scalar-to-main (2022-09-02) 9 commits
|
||||
- Documentation/technical: include Scalar technical doc
|
||||
- t/perf: add 'GIT_PERF_USE_SCALAR' run option
|
||||
- t/perf: add Scalar performance tests
|
||||
- scalar-clone: add test coverage
|
||||
- scalar: add to 'git help -a' command list
|
||||
- scalar: implement the `help` subcommand
|
||||
- git help: special-case `scalar`
|
||||
- scalar: include in standard Git build & installation
|
||||
- scalar: fix command documentation section header
|
||||
(merged to 'next' on 2022-09-14 at 230bf89c01)
|
||||
+ Documentation/technical: include Scalar technical doc
|
||||
+ t/perf: add 'GIT_PERF_USE_SCALAR' run option
|
||||
+ t/perf: add Scalar performance tests
|
||||
+ scalar-clone: add test coverage
|
||||
+ scalar: add to 'git help -a' command list
|
||||
+ scalar: implement the `help` subcommand
|
||||
+ git help: special-case `scalar`
|
||||
+ scalar: include in standard Git build & installation
|
||||
+ scalar: fix command documentation section header
|
||||
|
||||
Hoist the remainder of "scalar" out of contrib/ to the main part of
|
||||
the codebase.
|
||||
|
||||
Will merge to 'next'.
|
||||
Will merge to 'master'.
|
||||
source: <pull.1341.v2.git.1662134210.gitgitgadget@gmail.com>
|
||||
|
||||
|
||||
* ad/t1800-cygwin (2022-09-01) 1 commit
|
||||
- t1800: correct test to handle Cygwin
|
||||
* ad/t1800-cygwin (2022-09-15) 1 commit
|
||||
(merged to 'next' on 2022-09-15 at 9667abb48c)
|
||||
+ t1800: correct test to handle Cygwin
|
||||
|
||||
Test fix.
|
||||
|
||||
Expecting a reroll.
|
||||
cf. <YxFinAJ2NeKiHaS8@danh.dev>
|
||||
source: <20220901173942.abolcr4aa5gixncm@lucy.dinwoodie.org>
|
||||
Will merge to 'master'.
|
||||
source: <20220915075717.425673-1-adam@dinwoodie.org>
|
||||
|
||||
|
||||
* tb/diffstat-with-utf8-strwidth (2022-09-13) 2 commits
|
||||
- diff.c: More changes and tests around utf8_strwidth()
|
||||
- diff.c: When appropriate, use utf8_strwidth(), part1
|
||||
* tb/diffstat-with-utf8-strwidth (2022-09-14) 1 commit
|
||||
- diff.c: use utf8_strwidth() to count display width
|
||||
|
||||
"git diff --stat" etc. were invented back when everything was ASCII
|
||||
and strlen() was a way to measure the display width of a string;
|
||||
adjust them to compute the display width assuming UTF-8 pathnames.
|
||||
|
||||
Expecting a reroll.
|
||||
cf. <20220907043040.idqqivi3jt35jyst@tb-raspi4>
|
||||
source: <CA+VDVVVmi99i6ZY64tg8RkVXDc5gOzQP_SH12zhDKRkUnhWFgw@mail.gmail.com>
|
||||
source: <20220914151333.3309-1-tboegi@web.de>
|
||||
|
||||
|
||||
* gc/submodule-clone-update-with-branches (2022-08-29) 6 commits
|
||||
@ -473,18 +490,20 @@ Release tarballs are available at:
|
||||
|
||||
"git grep" learned to work better in a sparse checkout.
|
||||
|
||||
Will merge to 'next'? Or expecting a final reroll?
|
||||
The design of "--sparse" feels iffy.
|
||||
cf. <093827ae-41ef-5f7c-7829-647536ce1305@github.com>
|
||||
cf. <CABPp-BF-z72=hY_Jf8h3g95s+wwZOsV_S=+dDNs_AVskQxoaTw@mail.gmail.com>
|
||||
source: <20220908001854.206789-1-shaoxuan.yuan02@gmail.com>
|
||||
|
||||
|
||||
* ds/use-platform-regex-on-macos (2022-08-26) 1 commit
|
||||
- grep: fix multibyte regex handling under macOS
|
||||
(merged to 'next' on 2022-09-14 at 80905596d8)
|
||||
+ grep: fix multibyte regex handling under macOS
|
||||
|
||||
With a bit of header twiddling, use the native regexp library on
|
||||
macOS instead of the compat/ one.
|
||||
|
||||
Will merge to and cook in 'next'.
|
||||
Will cook in 'next'.
|
||||
cf. <xmqqzgf389k9.fsf@gitster.g>
|
||||
source: <20220826085815.2771102-1-dds@aueb.gr>
|
||||
|
||||
@ -524,31 +543,6 @@ Release tarballs are available at:
|
||||
source: <pull.1320.v2.git.1661243463.gitgitgadget@gmail.com>
|
||||
|
||||
|
||||
* jk/unused-annotation (2022-08-19) 11 commits
|
||||
(merged to 'next' on 2022-08-24 at 2174b8c75d)
|
||||
+ is_path_owned_by_current_uid(): mark "report" parameter as unused
|
||||
+ run-command: mark unused async callback parameters
|
||||
+ mark unused read_tree_recursive() callback parameters
|
||||
+ hashmap: mark unused callback parameters
|
||||
+ config: mark unused callback parameters
|
||||
+ streaming: mark unused virtual method parameters
|
||||
+ transport: mark bundle transport_options as unused
|
||||
+ refs: mark unused virtual method parameters
|
||||
+ refs: mark unused reflog callback parameters
|
||||
+ refs: mark unused each_ref_fn parameters
|
||||
+ git-compat-util: add UNUSED macro
|
||||
(this branch is used by ab/unused-annotation.)
|
||||
|
||||
Annotate function parameters that are not used (but cannot be
|
||||
removed for structural reasons), to prepare us to later compile
|
||||
with -Wunused warning turned on.
|
||||
|
||||
Will merge to 'master' along with 'ab/unused-annotation' that undoes the whole thing.
|
||||
cf. <Ywh7ppVFk6VK1Ybs@coredump.intra.peff.net>
|
||||
cf. <xmqqy1v7r3so.fsf@gitster.g>
|
||||
source: <Yv9gxqH6nK2KYnNj@coredump.intra.peff.net>
|
||||
|
||||
|
||||
* pw/rebase-keep-base-fixes (2022-09-07) 7 commits
|
||||
- rebase --keep-base: imply --no-fork-point
|
||||
- rebase --keep-base: imply --reapply-cherry-picks
|
||||
@ -617,53 +611,6 @@ Release tarballs are available at:
|
||||
source: <20220909222736.279362-1-shaoxuan.yuan02@gmail.com>
|
||||
|
||||
|
||||
* ab/dedup-config-and-command-docs (2022-09-07) 9 commits
|
||||
(merged to 'next' on 2022-09-08 at cd5b217110)
|
||||
+ docs: add CONFIGURATION sections that fuzzy map to built-ins
|
||||
+ docs: add CONFIGURATION sections that map to a built-in
|
||||
+ log docs: de-duplicate configuration sections
|
||||
+ difftool docs: de-duplicate configuration sections
|
||||
+ notes docs: de-duplicate and combine configuration sections
|
||||
+ apply docs: de-duplicate configuration sections
|
||||
+ send-email docs: de-duplicate configuration sections
|
||||
+ grep docs: de-duplicate configuration sections
|
||||
+ docs: add and use include template for config/* includes
|
||||
|
||||
Share the text used to explain configuration variables used by "git
|
||||
<subcmd>" in "git help <subcmd>" with the text from "git help config".
|
||||
|
||||
Will merge to 'master'.
|
||||
cf. <CAHd-oW71qvhG16YtMweA26SDCLKn+LHZe13njn18CD==9Ewbnw@mail.gmail.com>
|
||||
source: <cover-v4-0.9-00000000000-20220907T082419Z-avarab@gmail.com>
|
||||
|
||||
|
||||
* ab/submodule-helper-leakfix (2022-09-02) 18 commits
|
||||
(merged to 'next' on 2022-09-08 at bf21cfed4b)
|
||||
+ submodule--helper: fix a configure_added_submodule() leak
|
||||
+ submodule--helper: free rest of "displaypath" in "struct update_data"
|
||||
+ 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
|
||||
+ 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: add and use *_release() functions
|
||||
+ 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"
|
||||
+ Merge branch 'ab/submodule-helper-prep' into ab/submodule-helper-leakfix
|
||||
|
||||
Plugging leaks in submodule--helper.
|
||||
|
||||
Will merge to 'master'.
|
||||
source: <cover-v7-00.17-00000000000-20220831T231003Z-avarab@gmail.com>
|
||||
|
||||
|
||||
* po/glossary-around-traversal (2022-07-09) 3 commits
|
||||
- glossary: add reachability bitmap description
|
||||
- glossary: add commit graph description
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user