mirror of
https://github.com/git/git.git
synced 2026-08-10 17:15:14 +00:00
What's cooking (2021/10 #02)
This commit is contained in:
Junio C Hamano
@@ -1,10 +1,10 @@
|
||||
To: git@vger.kernel.org
|
||||
Bcc: lwn@lwn.net
|
||||
Subject: What's cooking in git.git (Oct 2021, #01; Mon, 4)
|
||||
X-master-at: 0785eb769886ae81e346df10e88bc49ffc0ac64e
|
||||
X-next-at: a309979bdfa2728e6961a1392c14b7ffd5cb9fa6
|
||||
Subject: What's cooking in git.git (Oct 2021, #02; Wed, 6)
|
||||
X-master-at: 106298f7f9cca4158a980de149ef217751e1f943
|
||||
X-next-at: 6e70778dc91e2139466c15ff15a02a22a2ada2d1
|
||||
|
||||
What's cooking in git.git (Oct 2021, #01; Mon, 4)
|
||||
What's cooking in git.git (Oct 2021, #02; Wed, 6)
|
||||
--------------------------------------------------
|
||||
|
||||
Here are the topics that have been cooking in my tree. Commits
|
||||
@@ -18,8 +18,7 @@ useful"). Do not read too much into a topic being in (or not in)
|
||||
'seen'. The ones marked with '.' do not appear in any of the
|
||||
integration branches, but I am still holding onto them.
|
||||
|
||||
Quite a few topics have graduated to 'master' and a handful of
|
||||
topics are getting readied for 'next'.
|
||||
The eleventh batch is in.
|
||||
|
||||
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
|
||||
@@ -52,159 +51,17 @@ Release tarballs are available at:
|
||||
--------------------------------------------------
|
||||
[Graduated to 'master']
|
||||
|
||||
* ab/auto-depend-with-pedantic (2021-09-22) 1 commit
|
||||
(merged to 'next' on 2021-09-28 at 532f2aa26e)
|
||||
+ Makefile: make COMPUTE_HEADER_DEPENDENCIES=auto work with DEVOPTS=pedantic
|
||||
* ab/repo-settings-cleanup (2021-09-22) 5 commits
|
||||
(merged to 'next' on 2021-09-28 at 43d70c31e1)
|
||||
+ repository.h: don't use a mix of int and bitfields
|
||||
+ repo-settings.c: simplify the setup
|
||||
+ read-cache & fetch-negotiator: check "enum" values in switch()
|
||||
+ environment.c: remove test-specific "ignore_untracked..." variable
|
||||
+ wrapper.c: add x{un,}setenv(), and use xsetenv() in environment.c
|
||||
|
||||
Improve build procedure for developers.
|
||||
Code cleanup.
|
||||
|
||||
|
||||
* ab/bundle-remove-verbose-option (2021-09-23) 1 commit
|
||||
(merged to 'next' on 2021-09-28 at 8251d269a2)
|
||||
+ bundle: remove ignored & undocumented "--verbose" flag
|
||||
|
||||
Doc update.
|
||||
|
||||
|
||||
* ab/make-clean-depend-dirs (2021-09-22) 1 commit
|
||||
(merged to 'next' on 2021-09-28 at 20483ade7d)
|
||||
+ Makefile: clean .depend dirs under COMPUTE_HEADER_DEPENDENCIES != yes
|
||||
|
||||
"make clean" has been updated to remove leftover .depend/
|
||||
directories, even when it is not told to use them to compute header
|
||||
dependencies.
|
||||
|
||||
|
||||
* ab/make-compdb-fix (2021-09-27) 1 commit
|
||||
(merged to 'next' on 2021-09-29 at b3439753df)
|
||||
+ Makefile: pass -Wno-pendantic under GENERATE_COMPILATION_DATABASE=yes
|
||||
|
||||
Build update.
|
||||
|
||||
|
||||
* ab/refs-files-cleanup (2021-08-25) 13 commits
|
||||
(merged to 'next' on 2021-09-23 at eb5668523f)
|
||||
+ refs/files: remove unused "errno != ENOTDIR" condition
|
||||
+ refs/files: remove unused "errno == EISDIR" code
|
||||
+ refs/files: remove unused "oid" in lock_ref_oid_basic()
|
||||
+ refs API: remove OID argument to reflog_expire()
|
||||
+ reflog expire: don't lock reflogs using previously seen OID
|
||||
+ refs/files: add a comment about refs_reflog_exists() call
|
||||
+ refs: make repo_dwim_log() accept a NULL oid
|
||||
+ refs/debug: re-indent argument list for "prepare"
|
||||
+ refs/files: remove unused "skip" in lock_raw_ref() too
|
||||
+ refs/files: remove unused "extras/skip" in lock_ref_oid_basic()
|
||||
+ refs: drop unused "flags" parameter to lock_ref_oid_basic()
|
||||
+ refs/files: remove unused REF_DELETING in lock_ref_oid_basic()
|
||||
+ refs/packet: add missing BUG() invocations to reflog callbacks
|
||||
(this branch is used by ab/refs-errno-cleanup and hn/refs-errno-cleanup.)
|
||||
|
||||
Continued work on top of the hn/refs-errno-cleanup topic.
|
||||
|
||||
|
||||
* ah/connect-parse-feature-v0-fix (2021-09-27) 1 commit
|
||||
(merged to 'next' on 2021-09-29 at 93a45727a2)
|
||||
+ connect: also update offset for features without values
|
||||
|
||||
Protocol v0 clients can get stuck parsing a malformed feature line.
|
||||
|
||||
|
||||
* bs/difftool-msg-tweak (2021-09-22) 1 commit
|
||||
(merged to 'next' on 2021-09-29 at 22d485e560)
|
||||
+ difftool: fix word spacing in the usage strings
|
||||
|
||||
Message tweak.
|
||||
|
||||
|
||||
* bs/ls-files-opt-help-text-update (2021-09-22) 1 commit
|
||||
(merged to 'next' on 2021-09-28 at d27c228644)
|
||||
+ ls-files: use imperative mood for -X and -z option description
|
||||
|
||||
Help text for "ls-files" options have been updated.
|
||||
|
||||
|
||||
* cb/cvsserver (2021-09-16) 3 commits
|
||||
(merged to 'next' on 2021-09-23 at 98f5f3f9cf)
|
||||
+ Documentation: cleanup git-cvsserver
|
||||
+ git-cvsserver: protect against NULL in crypt(3)
|
||||
+ git-cvsserver: use crypt correctly to compare password hashes
|
||||
|
||||
"git cvsserver" had a long-standing bug in its authentication code,
|
||||
which has finally been corrected (it is unclear and is a separate
|
||||
question if anybody is seriously using it, though).
|
||||
|
||||
|
||||
* da/difftool-dir-diff-symlink-fix (2021-09-23) 1 commit
|
||||
(merged to 'next' on 2021-09-28 at e2170ed0d7)
|
||||
+ difftool: fix symlink-file writing in dir-diff mode
|
||||
(this branch is used by da/difftool.)
|
||||
|
||||
"git difftool --dir-diff" mishandled symbolic links.
|
||||
|
||||
|
||||
* ds/perf-test-built-path-fix (2021-09-22) 1 commit
|
||||
(merged to 'next' on 2021-09-28 at 18a21483d9)
|
||||
+ t/perf/run: fix bin-wrappers computation
|
||||
|
||||
Perf test fix.
|
||||
|
||||
|
||||
* en/stash-df-fix (2021-09-10) 3 commits
|
||||
(merged to 'next' on 2021-09-20 at 513c11fb11)
|
||||
+ stash: restore untracked files AFTER restoring tracked files
|
||||
+ stash: avoid feeding directories to update-index
|
||||
+ t3903: document a pair of directory/file bugs
|
||||
|
||||
"git stash", where the tentative change involves changing a
|
||||
directory to a file (or vice versa), was confused, which has been
|
||||
corrected.
|
||||
|
||||
|
||||
* hn/refs-errno-cleanup (2021-08-25) 4 commits
|
||||
(merged to 'next' on 2021-09-23 at 502e6b6b08)
|
||||
+ refs: make errno output explicit for read_raw_ref_fn
|
||||
+ refs/files-backend: stop setting errno from lock_ref_oid_basic
|
||||
+ refs: remove EINVAL errno output from specification of read_raw_ref_fn
|
||||
+ refs file backend: move raceproof_create_file() here
|
||||
(this branch is used by ab/refs-errno-cleanup; uses ab/refs-files-cleanup.)
|
||||
|
||||
Futz with the way 'errno' is relied on in the refs API to carry the
|
||||
failure modes up the call chain.
|
||||
|
||||
|
||||
* jk/clone-unborn-head-in-bare (2021-09-20) 1 commit
|
||||
(merged to 'next' on 2021-09-20 at 93c93b8d51)
|
||||
+ clone: handle unborn branch in bare repos
|
||||
|
||||
"git clone" from a repository whose HEAD is unborn into a bare
|
||||
repository didn't follow the branch name the other side used, which
|
||||
is corrected.
|
||||
|
||||
|
||||
* jk/http-redact-fix (2021-09-22) 1 commit
|
||||
(merged to 'next' on 2021-09-28 at ef4570a5d1)
|
||||
+ http: match headers case-insensitively when redacting
|
||||
|
||||
Sensitive data in the HTTP trace were supposed to be redacted, but
|
||||
we failed to do so in HTTP/2 requests.
|
||||
|
||||
|
||||
* jx/ci-l10n (2021-09-09) 1 commit
|
||||
(merged to 'next' on 2021-09-23 at b2d7f5eecb)
|
||||
+ ci: new github-action for git-l10n code review
|
||||
|
||||
CI help for l10n.
|
||||
|
||||
|
||||
* rs/close-pack-leakfix (2021-09-24) 1 commit
|
||||
(merged to 'next' on 2021-09-28 at b14502faa0)
|
||||
+ packfile: release bad_objects in close_pack()
|
||||
|
||||
Leakfix.
|
||||
|
||||
--------------------------------------------------
|
||||
[New Topics]
|
||||
|
||||
* ab/retire-decl-of-missing-unused-funcs (2021-10-01) 4 commits
|
||||
(merged to 'next' on 2021-10-03 at a49287eaa9)
|
||||
+ config.h: remove unused git_config_get_untracked_cache() declaration
|
||||
@@ -214,10 +71,165 @@ Release tarballs are available at:
|
||||
|
||||
Remove external declaration of functions that no longer exist.
|
||||
|
||||
Will merge to 'master'.
|
||||
|
||||
* ab/retire-refs-unused-funcs (2021-09-28) 5 commits
|
||||
(merged to 'next' on 2021-10-03 at f91e74fa7d)
|
||||
+ refs/ref-cache.[ch]: remove "incomplete" from create_dir_entry()
|
||||
+ refs/ref-cache.c: remove "mkdir" parameter from find_containing_dir()
|
||||
+ refs/ref-cache.[ch]: remove unused add_ref_entry()
|
||||
+ refs/ref-cache.[ch]: remove unused remove_entry_from_dir()
|
||||
+ refs.[ch]: remove unused ref_storage_backend_exists()
|
||||
|
||||
Code cleanup.
|
||||
|
||||
|
||||
* pw/fix-some-issues-in-reset-head (2021-10-01) 12 commits
|
||||
* ab/retire-string-list-init (2021-09-28) 1 commit
|
||||
(merged to 'next' on 2021-10-03 at 4834949cc3)
|
||||
+ string-list.[ch]: remove string_list_init() compatibility function
|
||||
|
||||
Code cleanup.
|
||||
|
||||
|
||||
* ew/midx-doc-update (2021-09-24) 1 commit
|
||||
(merged to 'next' on 2021-09-28 at f2cbe598eb)
|
||||
+ doc/technical: update note about core.multiPackIndex
|
||||
|
||||
Doc tweak.
|
||||
|
||||
|
||||
* gc/doc-first-contribution-reroll (2021-09-22) 1 commit
|
||||
(merged to 'next' on 2021-09-29 at b7dea55eae)
|
||||
+ MyFirstContribution: Document --range-diff option when writing v2
|
||||
|
||||
Doc update.
|
||||
|
||||
|
||||
* jk/grep-haystack-is-read-only (2021-09-22) 5 commits
|
||||
(merged to 'next' on 2021-09-28 at 1660a6be89)
|
||||
+ grep: store grep_source buffer as const
|
||||
+ grep: mark "haystack" buffers as const
|
||||
+ grep: stop modifying buffer in grep_source_1()
|
||||
+ grep: stop modifying buffer in show_line()
|
||||
+ grep: stop modifying buffer in strip_timestamp
|
||||
(this branch is used by hm/paint-hits-in-log-grep.)
|
||||
|
||||
Code clean-up in the "grep" machinery.
|
||||
|
||||
|
||||
* jt/add-submodule-odb-clean-up (2021-09-09) 3 commits
|
||||
(merged to 'next' on 2021-09-28 at 4d843448be)
|
||||
+ revision: remove "submodule" from opt struct
|
||||
+ repository: support unabsorbed in repo_submodule_init
|
||||
+ submodule: remove unnecessary unabsorbed fallback
|
||||
(this branch is used by jt/no-abuse-alternate-odb-for-submodules.)
|
||||
|
||||
More code paths that use the hack to add submodule's object
|
||||
database to the set of alternate object store have been cleaned up.
|
||||
|
||||
|
||||
* lh/systemd-timers (2021-09-27) 1 commit
|
||||
(merged to 'next' on 2021-10-03 at 81834609ea)
|
||||
+ maintenance: fix test t7900-maintenance.sh
|
||||
|
||||
Testfix.
|
||||
|
||||
|
||||
* os/status-docfix (2021-09-28) 1 commit
|
||||
(merged to 'next' on 2021-10-03 at a13019916a)
|
||||
+ doc: fix capitalization in "git status --porcelain=v2" description
|
||||
|
||||
Docfix.
|
||||
|
||||
|
||||
* pw/rebase-of-a-tag-fix (2021-09-22) 10 commits
|
||||
(merged to 'next' on 2021-09-28 at 980add2a67)
|
||||
+ rebase: dereference tags
|
||||
+ rebase: use lookup_commit_reference_by_name()
|
||||
+ rebase: use our standard error return value
|
||||
+ t3407: rework rebase --quit tests
|
||||
+ t3407: strengthen rebase --abort tests
|
||||
+ t3407: use test_path_is_missing
|
||||
+ t3407: rename a variable
|
||||
+ t3407: use test_cmp_rev
|
||||
+ t3407: use test_commit
|
||||
+ t3407: run tests in $TEST_DIRECTORY
|
||||
(this branch is used by pw/fix-some-issues-in-reset-head.)
|
||||
|
||||
"git rebase <upstream> <tag>" failed when aborted in the middle, as
|
||||
it mistakenly tried to write the tag object instead of peeling it
|
||||
to HEAD.
|
||||
|
||||
|
||||
* pw/rebase-reread-todo-after-editing (2021-09-24) 2 commits
|
||||
(merged to 'next' on 2021-09-28 at c67d5e383e)
|
||||
+ rebase: fix todo-list rereading
|
||||
+ sequencer.c: factor out a function
|
||||
|
||||
The code to re-read the edited todo list in "git rebase -i" was
|
||||
made more robust.
|
||||
|
||||
|
||||
* tb/commit-graph-usage-fix (2021-09-22) 2 commits
|
||||
(merged to 'next' on 2021-09-28 at f021339c39)
|
||||
+ builtin/multi-pack-index.c: disable top-level --[no-]progress
|
||||
+ builtin/commit-graph.c: don't accept common --[no-]progress
|
||||
|
||||
Regression in "git commit-graph" command line parsing has been
|
||||
corrected.
|
||||
|
||||
|
||||
* ws/refer-to-forkpoint-config-in-rebase-doc (2021-09-20) 1 commit
|
||||
(merged to 'next' on 2021-09-29 at 49181eaafb)
|
||||
+ Document `rebase.forkpoint` in rebase man page
|
||||
|
||||
Doc update.
|
||||
|
||||
--------------------------------------------------
|
||||
[New Topics]
|
||||
|
||||
* gc/use-repo-settings (2021-10-04) 3 commits
|
||||
- gc: perform incremental repack when implictly enabled
|
||||
- fsck: verify multi-pack-index when implictly enabled
|
||||
- fsck: verify commit graph when implicitly enabled
|
||||
|
||||
It is wrong to read some settings directly from the config
|
||||
subsystem, as things like feature.experimental can affect their
|
||||
default values.
|
||||
|
||||
Under review.
|
||||
cf. <70aca052-716f-40ed-47c4-1882fdbd221e@gmail.com>
|
||||
|
||||
|
||||
* jh/perf-remove-test-times (2021-10-04) 1 commit
|
||||
- t/perf/perf-lib.sh: remove test_times.* at the end test_perf_()
|
||||
|
||||
Perf test fix.
|
||||
|
||||
Will merge to 'next'.
|
||||
|
||||
--------------------------------------------------
|
||||
[Stalled]
|
||||
|
||||
* ar/submodule-update (2021-09-20) 8 commits
|
||||
. submodule--helper: rename helper functions
|
||||
. submodule--helper: remove unused helpers
|
||||
. submodule--helper: remove update-clone subcommand
|
||||
. submodule: move core cmd_update() logic to C
|
||||
. submodule--helper: refactor get_submodule_displaypath()
|
||||
. submodule--helper: rename helpers for update-clone
|
||||
. submodule--helper: get remote names from any repository
|
||||
. submodule--helper: split up ensure_core_worktree()
|
||||
|
||||
Rewrite of "git submodule update" in C.
|
||||
|
||||
Kicked out of 'seen' to make room for es/superproject-aware-submodules
|
||||
which is among the topics this topic stomps on.
|
||||
|
||||
--------------------------------------------------
|
||||
[Cooking]
|
||||
|
||||
* pw/fix-some-issues-in-reset-head (2021-10-06) 13 commits
|
||||
- sparse index: fix use-after-free bug in cache_tree_verify()
|
||||
- rebase -m: don't fork git checkout
|
||||
- rebase --apply: set ORIG_HEAD correctly
|
||||
- rebase --apply: fix reflog
|
||||
@@ -230,7 +242,6 @@ Release tarballs are available at:
|
||||
- reset_head(): fix checkout
|
||||
- rebase: factor out checkout for up to date branch
|
||||
- Merge branch 'pw/rebase-of-a-tag-fix' into pw/fix-some-issues-in-reset-head
|
||||
(this branch uses pw/rebase-of-a-tag-fix.)
|
||||
|
||||
Fix "some issues" in a helper function reset_head().
|
||||
|
||||
@@ -270,14 +281,15 @@ Release tarballs are available at:
|
||||
|
||||
|
||||
* mr/bisect-in-c-4 (2021-10-01) 1 commit
|
||||
- bisect--helper: add space between colon and following sentence
|
||||
(merged to 'next' on 2021-10-06 at c13c14238d)
|
||||
+ bisect--helper: add space between colon and following sentence
|
||||
|
||||
Message fix.
|
||||
|
||||
Will merge to 'next'.
|
||||
Will merge to 'master'.
|
||||
|
||||
|
||||
* cm/save-restore-terminal (2021-10-04) 2 commits
|
||||
* cm/save-restore-terminal (2021-10-06) 2 commits
|
||||
- editor: save and reset terminal after calling EDITOR
|
||||
- terminal: teach git how to save/restore its terminal settings
|
||||
|
||||
@@ -290,51 +302,34 @@ Release tarballs are available at:
|
||||
|
||||
|
||||
* rs/p3400-lose-tac (2021-10-03) 1 commit
|
||||
- p3400: stop using tac(1)
|
||||
(merged to 'next' on 2021-10-06 at 688dc7137c)
|
||||
+ p3400: stop using tac(1)
|
||||
|
||||
Test portability update.
|
||||
|
||||
Will merge to 'next'.
|
||||
Will merge to 'master'.
|
||||
|
||||
|
||||
* ja/doc-status-types-and-copies (2021-10-04) 4 commits
|
||||
- Documentation/git-status: mention how to detect copies
|
||||
- Documentation/git-status: document porcelain status T (typechange)
|
||||
- Documentation/diff-format: state in which cases porcelain status is T
|
||||
- Documentation/git-status: remove impossible porcelain status DR and DC
|
||||
(merged to 'next' on 2021-10-06 at 4de6571bf7)
|
||||
+ Documentation/git-status: mention how to detect copies
|
||||
+ Documentation/git-status: document porcelain status T (typechange)
|
||||
+ Documentation/diff-format: state in which cases porcelain status is T
|
||||
+ Documentation/git-status: remove impossible porcelain status DR and DC
|
||||
|
||||
A few kinds of changes "git status" can show were not described.
|
||||
|
||||
Will merge to 'next'.
|
||||
Will merge to 'master'.
|
||||
|
||||
|
||||
* tb/aggregate-ignore-leading-whitespaces (2021-10-04) 1 commit
|
||||
- t/perf/aggregate.perl: tolerate leading spaces
|
||||
(merged to 'next' on 2021-10-06 at 619a7db2d4)
|
||||
+ t/perf/aggregate.perl: tolerate leading spaces
|
||||
|
||||
Test portability update.
|
||||
|
||||
Will merge to 'next'.
|
||||
Will merge to 'master'.
|
||||
|
||||
--------------------------------------------------
|
||||
[Stalled]
|
||||
|
||||
* ar/submodule-update (2021-09-20) 8 commits
|
||||
. submodule--helper: rename helper functions
|
||||
. submodule--helper: remove unused helpers
|
||||
. submodule--helper: remove update-clone subcommand
|
||||
. submodule: move core cmd_update() logic to C
|
||||
. submodule--helper: refactor get_submodule_displaypath()
|
||||
. submodule--helper: rename helpers for update-clone
|
||||
. submodule--helper: get remote names from any repository
|
||||
. submodule--helper: split up ensure_core_worktree()
|
||||
|
||||
Rewrite of "git submodule update" in C.
|
||||
|
||||
Kicked out of 'seen' to make room for es/superproject-aware-submodules
|
||||
which is among the topics this topic stomps on.
|
||||
|
||||
--------------------------------------------------
|
||||
[Cooking]
|
||||
|
||||
* ab/designated-initializers (2021-09-27) 5 commits
|
||||
(merged to 'next' on 2021-10-03 at 179f652de6)
|
||||
@@ -361,25 +356,7 @@ Release tarballs are available at:
|
||||
|
||||
Code clean-up.
|
||||
|
||||
Will merge to 'next'?
|
||||
|
||||
|
||||
* lh/systemd-timers (2021-09-27) 1 commit
|
||||
(merged to 'next' on 2021-10-03 at 81834609ea)
|
||||
+ maintenance: fix test t7900-maintenance.sh
|
||||
|
||||
Testfix.
|
||||
|
||||
Will merge to 'master'.
|
||||
|
||||
|
||||
* os/status-docfix (2021-09-28) 1 commit
|
||||
(merged to 'next' on 2021-10-03 at a13019916a)
|
||||
+ doc: fix capitalization in "git status --porcelain=v2" description
|
||||
|
||||
Docfix.
|
||||
|
||||
Will merge to 'master'.
|
||||
Will merge to 'next'.
|
||||
|
||||
|
||||
* ab/parse-options-cleanup (2021-10-01) 11 commits
|
||||
@@ -409,30 +386,9 @@ Release tarballs are available at:
|
||||
Will merge to 'master'.
|
||||
|
||||
|
||||
* ab/retire-refs-unused-funcs (2021-09-28) 5 commits
|
||||
(merged to 'next' on 2021-10-03 at f91e74fa7d)
|
||||
+ refs/ref-cache.[ch]: remove "incomplete" from create_dir_entry()
|
||||
+ refs/ref-cache.c: remove "mkdir" parameter from find_containing_dir()
|
||||
+ refs/ref-cache.[ch]: remove unused add_ref_entry()
|
||||
+ refs/ref-cache.[ch]: remove unused remove_entry_from_dir()
|
||||
+ refs.[ch]: remove unused ref_storage_backend_exists()
|
||||
|
||||
Code cleanup.
|
||||
|
||||
Will merge to 'master'.
|
||||
|
||||
|
||||
* ab/retire-string-list-init (2021-09-28) 1 commit
|
||||
(merged to 'next' on 2021-10-03 at 4834949cc3)
|
||||
+ string-list.[ch]: remove string_list_init() compatibility function
|
||||
|
||||
Code cleanup.
|
||||
|
||||
Will merge to 'master'.
|
||||
|
||||
|
||||
* mt/grep-submodule-textconv (2021-09-29) 1 commit
|
||||
- grep: demonstrate bug with textconv attributes and submodules
|
||||
(merged to 'next' on 2021-10-06 at 1950944b8c)
|
||||
+ grep: demonstrate bug with textconv attributes and submodules
|
||||
|
||||
"git grep --recurse-submodules" takes trees and blobs from the
|
||||
submodule repository, but the textconv settings when processing a
|
||||
@@ -440,7 +396,7 @@ Release tarballs are available at:
|
||||
A demonstration is added to demonstrate the issue, without fixing
|
||||
it.
|
||||
|
||||
Will merge to 'next'.
|
||||
Will merge to 'master'.
|
||||
|
||||
|
||||
* es/superproject-aware-submodules (2021-08-19) 5 commits
|
||||
@@ -479,22 +435,23 @@ Release tarballs are available at:
|
||||
"git fsck" has been taught to report mismatch between expected and
|
||||
actual types of an object better.
|
||||
|
||||
Will merge to 'next'?
|
||||
Will merge to 'next'.
|
||||
|
||||
|
||||
* ab/config-based-hooks-1 (2021-09-27) 8 commits
|
||||
- hook-list.h: add a generated list of hooks, like config-list.h
|
||||
- hook.c users: use "hook_exists()" instead of "find_hook()"
|
||||
- hook.c: add a hook_exists() wrapper and use it in bugreport.c
|
||||
- hook.[ch]: move find_hook() from run-command.c to hook.c
|
||||
- Makefile: remove an out-of-date comment
|
||||
- Makefile: don't perform "mv $@+ $@" dance for $(GENERATED_H)
|
||||
- Makefile: stop hardcoding {command,config}-list.h
|
||||
- Makefile: mark "check" target as .PHONY
|
||||
(merged to 'next' on 2021-10-06 at d05325ed35)
|
||||
+ hook-list.h: add a generated list of hooks, like config-list.h
|
||||
+ hook.c users: use "hook_exists()" instead of "find_hook()"
|
||||
+ hook.c: add a hook_exists() wrapper and use it in bugreport.c
|
||||
+ hook.[ch]: move find_hook() from run-command.c to hook.c
|
||||
+ Makefile: remove an out-of-date comment
|
||||
+ Makefile: don't perform "mv $@+ $@" dance for $(GENERATED_H)
|
||||
+ Makefile: stop hardcoding {command,config}-list.h
|
||||
+ Makefile: mark "check" target as .PHONY
|
||||
|
||||
Mostly preliminary clean-up in the hook API.
|
||||
|
||||
Will merge to 'next'.
|
||||
Will merge to 'master'.
|
||||
|
||||
|
||||
* ab/http-pinned-public-key-mismatch (2021-09-27) 1 commit
|
||||
@@ -532,40 +489,6 @@ Release tarballs are available at:
|
||||
Will merge to 'master'.
|
||||
|
||||
|
||||
* pw/rebase-reread-todo-after-editing (2021-09-24) 2 commits
|
||||
(merged to 'next' on 2021-09-28 at c67d5e383e)
|
||||
+ rebase: fix todo-list rereading
|
||||
+ sequencer.c: factor out a function
|
||||
|
||||
The code to re-read the edited todo list in "git rebase -i" was
|
||||
made more robust.
|
||||
|
||||
Will merge to 'master'.
|
||||
|
||||
|
||||
* gc/doc-first-contribution-reroll (2021-09-22) 1 commit
|
||||
(merged to 'next' on 2021-09-29 at b7dea55eae)
|
||||
+ MyFirstContribution: Document --range-diff option when writing v2
|
||||
|
||||
Doc update.
|
||||
|
||||
Will merge to 'master'.
|
||||
|
||||
|
||||
* jk/grep-haystack-is-read-only (2021-09-22) 5 commits
|
||||
(merged to 'next' on 2021-09-28 at 1660a6be89)
|
||||
+ grep: store grep_source buffer as const
|
||||
+ grep: mark "haystack" buffers as const
|
||||
+ grep: stop modifying buffer in grep_source_1()
|
||||
+ grep: stop modifying buffer in show_line()
|
||||
+ grep: stop modifying buffer in strip_timestamp
|
||||
(this branch is used by hm/paint-hits-in-log-grep.)
|
||||
|
||||
Code clean-up in the "grep" machinery.
|
||||
|
||||
Will merge to 'master'.
|
||||
|
||||
|
||||
* js/win-lazyload-buildfix (2021-09-28) 3 commits
|
||||
(merged to 'next' on 2021-10-03 at 26802e5d73)
|
||||
+ Makefile: restrict -Wpedantic and -Wno-pedantic-ms-format better
|
||||
@@ -578,20 +501,12 @@ Release tarballs are available at:
|
||||
|
||||
|
||||
* ab/make-sparse-for-real (2021-09-22) 1 commit
|
||||
- Makefile: make the "sparse" target non-.PHONY
|
||||
(merged to 'next' on 2021-10-06 at 10e3c31d6a)
|
||||
+ Makefile: make the "sparse" target non-.PHONY
|
||||
|
||||
Prevent "make sparse" from running for the source files that
|
||||
haven't been modified.
|
||||
|
||||
Will merge to 'next'?
|
||||
|
||||
|
||||
* ew/midx-doc-update (2021-09-24) 1 commit
|
||||
(merged to 'next' on 2021-09-28 at f2cbe598eb)
|
||||
+ doc/technical: update note about core.multiPackIndex
|
||||
|
||||
Doc tweak.
|
||||
|
||||
Will merge to 'master'.
|
||||
|
||||
|
||||
@@ -606,12 +521,14 @@ Release tarballs are available at:
|
||||
- refs: plumb repo into ref stores
|
||||
- Merge branch 'jk/ref-paranoia' into jt/no-abuse-alternate-odb-for-submodules
|
||||
- Merge branch 'jt/add-submodule-odb-clean-up' into jt/no-abuse-alternate-odb-for-submodules
|
||||
(this branch uses jk/ref-paranoia and jt/add-submodule-odb-clean-up.)
|
||||
(this branch uses jk/ref-paranoia.)
|
||||
|
||||
Follow through the work to use the repo interface to access
|
||||
submodule objects in-process, instead of abusing the alternate
|
||||
object database interface.
|
||||
|
||||
Expecting a reroll.
|
||||
|
||||
|
||||
* tp/send-email-completion (2021-09-22) 3 commits
|
||||
- send-email docs: add format-patch options
|
||||
@@ -629,25 +546,12 @@ Release tarballs are available at:
|
||||
- pretty: colorize pattern matches in commit messages
|
||||
- grep: refactor next_match() and match_one_pattern() for external use
|
||||
- Merge branch 'jk/grep-haystack-is-read-only' into hm/paint-hits-in-log-grep
|
||||
(this branch uses jk/grep-haystack-is-read-only.)
|
||||
|
||||
"git log --grep=string --author=name" learns to highlight hits just
|
||||
like "git grep string" does.
|
||||
|
||||
Will merge to 'next'?
|
||||
|
||||
|
||||
* ab/repo-settings-cleanup (2021-09-22) 5 commits
|
||||
(merged to 'next' on 2021-09-28 at 43d70c31e1)
|
||||
+ repository.h: don't use a mix of int and bitfields
|
||||
+ repo-settings.c: simplify the setup
|
||||
+ read-cache & fetch-negotiator: check "enum" values in switch()
|
||||
+ environment.c: remove test-specific "ignore_untracked..." variable
|
||||
+ wrapper.c: add x{un,}setenv(), and use xsetenv() in environment.c
|
||||
|
||||
Code cleanup.
|
||||
|
||||
Will merge to 'master'.
|
||||
Expecting a reroll.
|
||||
cf. <87v92bju64.fsf@evledraar.gmail.com>
|
||||
|
||||
|
||||
* da/difftool (2021-09-30) 6 commits
|
||||
@@ -665,22 +569,23 @@ Release tarballs are available at:
|
||||
|
||||
|
||||
* en/removing-untracked-fixes (2021-09-27) 12 commits
|
||||
- Documentation: call out commands that nuke untracked files/directories
|
||||
- Comment important codepaths regarding nuking untracked files/dirs
|
||||
- unpack-trees: avoid nuking untracked dir in way of locally deleted file
|
||||
- unpack-trees: avoid nuking untracked dir in way of unmerged file
|
||||
- Change unpack_trees' 'reset' flag into an enum
|
||||
- Remove ignored files by default when they are in the way
|
||||
- unpack-trees: make dir an internal-only struct
|
||||
- unpack-trees: introduce preserve_ignored to unpack_trees_options
|
||||
- read-tree, merge-recursive: overwrite ignored files by default
|
||||
- checkout, read-tree: fix leak of unpack_trees_options.dir
|
||||
- t2500: add various tests for nuking untracked files
|
||||
- Merge branch 'en/am-abort-fix' into en/removing-untracked-fixes
|
||||
(merged to 'next' on 2021-10-06 at fc4e387fda)
|
||||
+ Documentation: call out commands that nuke untracked files/directories
|
||||
+ Comment important codepaths regarding nuking untracked files/dirs
|
||||
+ unpack-trees: avoid nuking untracked dir in way of locally deleted file
|
||||
+ unpack-trees: avoid nuking untracked dir in way of unmerged file
|
||||
+ Change unpack_trees' 'reset' flag into an enum
|
||||
+ Remove ignored files by default when they are in the way
|
||||
+ unpack-trees: make dir an internal-only struct
|
||||
+ unpack-trees: introduce preserve_ignored to unpack_trees_options
|
||||
+ read-tree, merge-recursive: overwrite ignored files by default
|
||||
+ checkout, read-tree: fix leak of unpack_trees_options.dir
|
||||
+ t2500: add various tests for nuking untracked files
|
||||
+ Merge branch 'en/am-abort-fix' into en/removing-untracked-fixes
|
||||
|
||||
Various fixes in code paths that move untracked files away to make room.
|
||||
|
||||
Will merge to 'next'.
|
||||
Will merge to 'master'.
|
||||
|
||||
|
||||
* ks/submodule-add-message-fix (2021-09-20) 1 commit
|
||||
@@ -692,26 +597,6 @@ Release tarballs are available at:
|
||||
cf. <m27df9lvm1.fsf@gmail.com>
|
||||
|
||||
|
||||
* tb/commit-graph-usage-fix (2021-09-22) 2 commits
|
||||
(merged to 'next' on 2021-09-28 at f021339c39)
|
||||
+ builtin/multi-pack-index.c: disable top-level --[no-]progress
|
||||
+ builtin/commit-graph.c: don't accept common --[no-]progress
|
||||
|
||||
Regression in "git commit-graph" command line parsing has been
|
||||
corrected.
|
||||
|
||||
Will merge to 'master'.
|
||||
|
||||
|
||||
* ws/refer-to-forkpoint-config-in-rebase-doc (2021-09-20) 1 commit
|
||||
(merged to 'next' on 2021-09-29 at 49181eaafb)
|
||||
+ Document `rebase.forkpoint` in rebase man page
|
||||
|
||||
Doc update.
|
||||
|
||||
Will merge to 'master'.
|
||||
|
||||
|
||||
* ns/batched-fsync (2021-10-04) 9 commits
|
||||
. core.fsyncobjectfiles: performance tests for add and stash
|
||||
. core.fsyncobjectfiles: tests for batch mode
|
||||
@@ -733,86 +618,91 @@ Release tarballs are available at:
|
||||
|
||||
|
||||
* jh/builtin-fsmonitor-part1 (2021-09-20) 7 commits
|
||||
- t/helper/simple-ipc: convert test-simple-ipc to use start_bg_command
|
||||
- run-command: create start_bg_command
|
||||
- simple-ipc/ipc-win32: add Windows ACL to named pipe
|
||||
- simple-ipc/ipc-win32: add trace2 debugging
|
||||
- simple-ipc: move definition of ipc_active_state outside of ifdef
|
||||
- simple-ipc: preparations for supporting binary messages.
|
||||
- trace2: add trace2_child_ready() to report on background children
|
||||
(merged to 'next' on 2021-10-06 at 021f633b9c)
|
||||
+ t/helper/simple-ipc: convert test-simple-ipc to use start_bg_command
|
||||
+ run-command: create start_bg_command
|
||||
+ simple-ipc/ipc-win32: add Windows ACL to named pipe
|
||||
+ simple-ipc/ipc-win32: add trace2 debugging
|
||||
+ simple-ipc: move definition of ipc_active_state outside of ifdef
|
||||
+ simple-ipc: preparations for supporting binary messages.
|
||||
+ trace2: add trace2_child_ready() to report on background children
|
||||
|
||||
Built-in fsmonitor (part 1).
|
||||
|
||||
Will merge to 'next'.
|
||||
Will merge to 'master'.
|
||||
|
||||
|
||||
* ab/align-parse-options-help (2021-09-22) 4 commits
|
||||
- parse-options: properly align continued usage output
|
||||
- git rev-parse --parseopt tests: add more usagestr tests
|
||||
- send-pack: properly use parse_options() API for usage string
|
||||
- parse-options API users: align usage output in C-strings
|
||||
(merged to 'next' on 2021-10-06 at e22da7ef85)
|
||||
+ parse-options: properly align continued usage output
|
||||
+ git rev-parse --parseopt tests: add more usagestr tests
|
||||
+ send-pack: properly use parse_options() API for usage string
|
||||
+ parse-options API users: align usage output in C-strings
|
||||
|
||||
When "git cmd -h" shows more than one line of usage text (e.g.
|
||||
the cmd subcommand may take sub-sub-command), parse-options API
|
||||
learned to align these lines, even across i18n/l10n.
|
||||
|
||||
Will merge to 'next'?
|
||||
Will merge to 'master'.
|
||||
|
||||
|
||||
* ab/help-config-vars (2021-09-23) 9 commits
|
||||
- help: move column config discovery to help.c library
|
||||
- help / completion: make "git help" do the hard work
|
||||
- help tests: test --config-for-completion option & output
|
||||
- help: simplify by moving to OPT_CMDMODE()
|
||||
- help: correct logic error in combining --all and --guides
|
||||
- help: correct logic error in combining --all and --config
|
||||
- help tests: add test for --config output
|
||||
- help: correct usage & behavior of "git help --guides"
|
||||
- help: correct the usage string in -h and documentation
|
||||
(merged to 'next' on 2021-10-06 at bf9538cfbd)
|
||||
+ help: move column config discovery to help.c library
|
||||
+ help / completion: make "git help" do the hard work
|
||||
+ help tests: test --config-for-completion option & output
|
||||
+ help: simplify by moving to OPT_CMDMODE()
|
||||
+ help: correct logic error in combining --all and --guides
|
||||
+ help: correct logic error in combining --all and --config
|
||||
+ help tests: add test for --config output
|
||||
+ help: correct usage & behavior of "git help --guides"
|
||||
+ help: correct the usage string in -h and documentation
|
||||
|
||||
Teach "git help -c" into helping the command line completion of
|
||||
configuration variables.
|
||||
|
||||
Will merge to 'next'?
|
||||
Will merge to 'master'.
|
||||
|
||||
|
||||
* tb/repack-write-midx (2021-10-01) 9 commits
|
||||
- builtin/repack.c: pass `--refs-snapshot` when writing bitmaps
|
||||
- builtin/repack.c: make largest pack preferred
|
||||
- builtin/repack.c: support writing a MIDX while repacking
|
||||
- builtin/repack.c: extract showing progress to a variable
|
||||
- builtin/repack.c: rename variables that deal with non-kept packs
|
||||
- builtin/repack.c: keep track of existing packs unconditionally
|
||||
- midx: preliminary support for `--refs-snapshot`
|
||||
- builtin/multi-pack-index.c: support `--stdin-packs` mode
|
||||
- midx: expose `write_midx_file_only()` publicly
|
||||
(merged to 'next' on 2021-10-06 at ccdd5aaf2a)
|
||||
+ builtin/repack.c: pass `--refs-snapshot` when writing bitmaps
|
||||
+ builtin/repack.c: make largest pack preferred
|
||||
+ builtin/repack.c: support writing a MIDX while repacking
|
||||
+ builtin/repack.c: extract showing progress to a variable
|
||||
+ builtin/repack.c: rename variables that deal with non-kept packs
|
||||
+ builtin/repack.c: keep track of existing packs unconditionally
|
||||
+ midx: preliminary support for `--refs-snapshot`
|
||||
+ builtin/multi-pack-index.c: support `--stdin-packs` mode
|
||||
+ midx: expose `write_midx_file_only()` publicly
|
||||
|
||||
"git repack" has been taught to generate multi-pack reachability
|
||||
bitmaps.
|
||||
|
||||
Will merge to 'next'?
|
||||
Will merge to 'master'.
|
||||
|
||||
|
||||
* ds/add-rm-with-sparse-index (2021-09-28) 13 commits
|
||||
- advice: update message to suggest '--sparse'
|
||||
- mv: refuse to move sparse paths
|
||||
- rm: skip sparse paths with missing SKIP_WORKTREE
|
||||
- rm: add --sparse option
|
||||
- add: update --renormalize to skip sparse paths
|
||||
- add: update --chmod to skip sparse paths
|
||||
- add: implement the --sparse option
|
||||
- add: skip tracked paths outside sparse-checkout cone
|
||||
- add: fail when adding an untracked sparse file
|
||||
- dir: fix pattern matching on dirs
|
||||
- dir: select directories correctly
|
||||
- t1092: behavior for adding sparse files
|
||||
- t3705: test that 'sparse_entry' is unstaged
|
||||
(merged to 'next' on 2021-10-06 at 80a9cda797)
|
||||
+ advice: update message to suggest '--sparse'
|
||||
+ mv: refuse to move sparse paths
|
||||
+ rm: skip sparse paths with missing SKIP_WORKTREE
|
||||
+ rm: add --sparse option
|
||||
+ add: update --renormalize to skip sparse paths
|
||||
+ add: update --chmod to skip sparse paths
|
||||
+ add: implement the --sparse option
|
||||
+ add: skip tracked paths outside sparse-checkout cone
|
||||
+ add: fail when adding an untracked sparse file
|
||||
+ dir: fix pattern matching on dirs
|
||||
+ dir: select directories correctly
|
||||
+ t1092: behavior for adding sparse files
|
||||
+ t3705: test that 'sparse_entry' is unstaged
|
||||
|
||||
"git add", "git mv", and "git rm" have been adjusted to avoid
|
||||
updating paths outside of the sparse-checkout definition unless
|
||||
the user specifies a "--sparse" option.
|
||||
|
||||
Will merge to 'next'.
|
||||
Will merge to 'master'.
|
||||
|
||||
|
||||
* tb/midx-write-propagate-namehash (2021-09-17) 7 commits
|
||||
@@ -831,27 +721,6 @@ Release tarballs are available at:
|
||||
Will merge to 'master'.
|
||||
|
||||
|
||||
* pw/rebase-of-a-tag-fix (2021-09-22) 10 commits
|
||||
(merged to 'next' on 2021-09-28 at 980add2a67)
|
||||
+ rebase: dereference tags
|
||||
+ rebase: use lookup_commit_reference_by_name()
|
||||
+ rebase: use our standard error return value
|
||||
+ t3407: rework rebase --quit tests
|
||||
+ t3407: strengthen rebase --abort tests
|
||||
+ t3407: use test_path_is_missing
|
||||
+ t3407: rename a variable
|
||||
+ t3407: use test_cmp_rev
|
||||
+ t3407: use test_commit
|
||||
+ t3407: run tests in $TEST_DIRECTORY
|
||||
(this branch is used by pw/fix-some-issues-in-reset-head.)
|
||||
|
||||
"git rebase <upstream> <tag>" failed when aborted in the middle, as
|
||||
it mistakenly tried to write the tag object instead of peeling it
|
||||
to HEAD.
|
||||
|
||||
Will merge to 'master'.
|
||||
|
||||
|
||||
* en/zdiff3 (2021-09-20) 2 commits
|
||||
- update documentation for new zdiff3 conflictStyle
|
||||
- xdiff: implement a zealous diff3, or "zdiff3"
|
||||
@@ -859,19 +728,6 @@ Release tarballs are available at:
|
||||
"Zealous diff3" style of merge conflict presentation has been added.
|
||||
|
||||
|
||||
* jt/add-submodule-odb-clean-up (2021-09-09) 3 commits
|
||||
(merged to 'next' on 2021-09-28 at 4d843448be)
|
||||
+ revision: remove "submodule" from opt struct
|
||||
+ repository: support unabsorbed in repo_submodule_init
|
||||
+ submodule: remove unnecessary unabsorbed fallback
|
||||
(this branch is used by jt/no-abuse-alternate-odb-for-submodules.)
|
||||
|
||||
More code paths that use the hack to add submodule's object
|
||||
database to the set of alternate object store have been cleaned up.
|
||||
|
||||
Will merge to 'master'.
|
||||
|
||||
|
||||
* js/scalar (2021-09-14) 15 commits
|
||||
- scalar: accept -C and -c options before the subcommand
|
||||
- scalar: implement the `version` command
|
||||
@@ -977,19 +833,20 @@ Release tarballs are available at:
|
||||
|
||||
|
||||
* ab/lib-subtest (2021-09-22) 9 commits
|
||||
- test-lib tests: get rid of copy/pasted mock test code
|
||||
- test-lib tests: assert 1 exit code, not non-zero
|
||||
- test-lib tests: refactor common part of check_sub_test_lib_test*()
|
||||
- test-lib tests: avoid subshell for "test_cmp" for readability
|
||||
- test-lib tests: don't provide a description for the sub-tests
|
||||
- test-lib tests: split up "write and run" into two functions
|
||||
- test-lib tests: move "run_sub_test" to a new lib-subtest.sh
|
||||
- Merge branch 'ps/t0000-output-directory-fix' into ab/lib-subtest
|
||||
- Merge branch 'jk/t0000-subtests-fix' into ab/lib-subtest
|
||||
(merged to 'next' on 2021-10-06 at e8fa261811)
|
||||
+ test-lib tests: get rid of copy/pasted mock test code
|
||||
+ test-lib tests: assert 1 exit code, not non-zero
|
||||
+ test-lib tests: refactor common part of check_sub_test_lib_test*()
|
||||
+ test-lib tests: avoid subshell for "test_cmp" for readability
|
||||
+ test-lib tests: don't provide a description for the sub-tests
|
||||
+ test-lib tests: split up "write and run" into two functions
|
||||
+ test-lib tests: move "run_sub_test" to a new lib-subtest.sh
|
||||
+ Merge branch 'ps/t0000-output-directory-fix' into ab/lib-subtest
|
||||
+ Merge branch 'jk/t0000-subtests-fix' into ab/lib-subtest
|
||||
|
||||
Updates to the tests in t0000 to test the test framework.
|
||||
|
||||
Will merge to 'next'.
|
||||
Will merge to 'master'.
|
||||
|
||||
|
||||
* ab/only-single-progress-at-once (2021-09-22) 8 commits
|
||||
@@ -1018,7 +875,7 @@ Release tarballs are available at:
|
||||
|
||||
Use ssh public crypto for object and push-cert signing.
|
||||
|
||||
Will merge to 'next'?
|
||||
Will merge to 'next'.
|
||||
|
||||
|
||||
* cf/fetch-set-upstream-while-detached (2021-07-06) 1 commit
|
||||
@@ -1253,5 +1110,3 @@ Release tarballs are available at:
|
||||
Test portability update.
|
||||
|
||||
The tb/aggregate-ignore-leading-whitespaces supersedes this topic.
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user