mirror of
https://github.com/git/git.git
synced 2026-04-02 13:00:08 +02:00
What's cooking (2023/02 #01)
This commit is contained in:
@@ -1,10 +1,10 @@
|
||||
To: git@vger.kernel.org
|
||||
Subject: What's cooking in git.git (Jan 2023, #07; Mon, 30)
|
||||
Subject: What's cooking in git.git (Feb 2023, #01; Thu, 2)
|
||||
X-master-at: 2fc9e9ca3c7505bc60069f11e7ef09b1aeeee473
|
||||
X-next-at: b5b5020ace4838582d9c7d79847f668b65391eb7
|
||||
X-next-at: 98d13ac3e7da4ec0524fa5d9aa17447fe57bbb77
|
||||
Bcc: lwn@lwn.net, gitster@pobox.com
|
||||
|
||||
What's cooking in git.git (Jan 2023, #08; Mon, 30)
|
||||
What's cooking in git.git (Feb 2023, #01; Thu, 2)
|
||||
--------------------------------------------------
|
||||
|
||||
Here are the topics that have been cooking in my tree. Commits
|
||||
@@ -42,164 +42,97 @@ Release tarballs are available at:
|
||||
|
||||
https://www.kernel.org/pub/software/scm/git/
|
||||
|
||||
--------------------------------------------------
|
||||
[Graduated to 'master']
|
||||
|
||||
* ab/cache-api-cleanup-users (2023-01-17) 3 commits
|
||||
(merged to 'next' on 2023-01-18 at c5a4374652)
|
||||
+ treewide: always have a valid "index_state.repo" member
|
||||
+ Merge branch 'ds/omit-trailing-hash-in-index' into ab/cache-api-cleanup-users
|
||||
+ Merge branch 'ab/cache-api-cleanup' into ab/cache-api-cleanup-users
|
||||
|
||||
Updates the users of the cache API.
|
||||
cf. <db312853-81a1-542b-db96-d816c463516c@github.com>
|
||||
source: <patch-1.1-b4998652822-20230117T135234Z-avarab@gmail.com>
|
||||
|
||||
|
||||
* ar/markup-em-dash (2023-01-23) 1 commit
|
||||
(merged to 'next' on 2023-01-24 at 0367e3035f)
|
||||
+ Documentation: render dash correctly
|
||||
|
||||
Doc mark-up updates.
|
||||
source: <20230123090114.429844-1-rybak.a.v@gmail.com>
|
||||
|
||||
|
||||
* cb/grep-pcre-ucp (2023-01-18) 1 commit
|
||||
(merged to 'next' on 2023-01-19 at 2c7e531839)
|
||||
+ grep: correctly identify utf-8 characters with \{b,w} in -P
|
||||
|
||||
"grep -P" learned to use Unicode Character Property to grok
|
||||
character classes when processing \b and \w etc.
|
||||
cf. <xmqqzgaf2zpt.fsf@gitster.g>
|
||||
source: <20230108155217.2817-1-carenas@gmail.com>
|
||||
|
||||
|
||||
* cw/fetch-remote-group-with-duplication (2023-01-19) 1 commit
|
||||
(merged to 'next' on 2023-01-20 at 7f00e43209)
|
||||
+ fetch: fix duplicate remote parallel fetch bug
|
||||
|
||||
"git fetch <group>", when "<group>" of remotes lists the same
|
||||
remote twice, unnecessarily failed when parallel fetching was
|
||||
enabled, which has been corrected.
|
||||
source: <20230119220538.1522464-1-calvinwan@google.com>
|
||||
|
||||
|
||||
* jc/doc-branch-update-checked-out-branch (2023-01-18) 1 commit
|
||||
(merged to 'next' on 2023-01-19 at 970900a232)
|
||||
+ branch: document `-f` and linked worktree behaviour
|
||||
|
||||
Document that "branch -f <branch>" disables only the safety to
|
||||
avoid recreating an existing branch.
|
||||
source: <xmqqa62f2dj1.fsf_-_@gitster.g>
|
||||
|
||||
|
||||
* jc/doc-checkout-b (2023-01-19) 1 commit
|
||||
(merged to 'next' on 2023-01-23 at 95340e1941)
|
||||
+ checkout: document -b/-B to highlight the differences from "git branch"
|
||||
|
||||
Clarify how "checkout -b/-B" and "git branch [-f]" are similar but
|
||||
different in the documentation.
|
||||
source: <xmqqtu0m1m9i.fsf@gitster.g>
|
||||
|
||||
|
||||
* jk/hash-object-fsck (2023-01-19) 7 commits
|
||||
(merged to 'next' on 2023-01-23 at 985e87fc34)
|
||||
+ fsck: do not assume NUL-termination of buffers
|
||||
+ hash-object: use fsck for object checks
|
||||
+ fsck: provide a function to fsck buffer without object struct
|
||||
+ t: use hash-object --literally when created malformed objects
|
||||
+ t7030: stop using invalid tag name
|
||||
+ t1006: stop using 0-padded timestamps
|
||||
+ t1007: modernize malformed object tests
|
||||
|
||||
"git hash-object" now checks that the resulting object is well
|
||||
formed with the same code as "git fsck".
|
||||
source: <Y8hX+pIZUKXsyYj5@coredump.intra.peff.net>
|
||||
source: <Y8ifa7hyqxSbL92U@coredump.intra.peff.net>
|
||||
|
||||
|
||||
* jk/hash-object-literally-fd-leak (2023-01-19) 1 commit
|
||||
(merged to 'next' on 2023-01-19 at fff9b60a36)
|
||||
+ hash-object: fix descriptor leak with --literally
|
||||
|
||||
Leakfix.
|
||||
source: <Y8ijpJqtkDTi792i@coredump.intra.peff.net>
|
||||
|
||||
|
||||
* km/send-email-with-v-reroll-count (2022-11-27) 1 commit
|
||||
(merged to 'next' on 2023-01-19 at 9b3543471c)
|
||||
+ send-email: relay '-v N' to format-patch
|
||||
|
||||
"git send-email -v 3" used to be expanded to "git send-email
|
||||
--validate 3" when the user meant to pass them down to
|
||||
"format-patch", which has been corrected.
|
||||
source: <87edtp5uws.fsf@kyleam.com>
|
||||
|
||||
|
||||
* pb/branch-advice-recurse-submodules (2023-01-18) 1 commit
|
||||
(merged to 'next' on 2023-01-19 at 13747fc72d)
|
||||
+ branch: improve advice when --recurse-submodules fails
|
||||
|
||||
Improve advice message given when "git branch --recurse-submodules"
|
||||
fails.
|
||||
source: <pull.1464.git.1673890908453.gitgitgadget@gmail.com>
|
||||
|
||||
|
||||
* po/pretty-format-columns-doc (2023-01-19) 5 commits
|
||||
(merged to 'next' on 2023-01-23 at d41cb5f527)
|
||||
+ doc: pretty-formats note wide char limitations, and add tests
|
||||
+ doc: pretty-formats describe use of ellipsis in truncation
|
||||
+ doc: pretty-formats document negative column alignments
|
||||
+ doc: pretty-formats: delineate `%<|(` parameter values
|
||||
+ doc: pretty-formats: separate parameters from placeholders
|
||||
|
||||
Clarify column-padding operators in the pretty format string.
|
||||
source: <20230119181827.1319-1-philipoakley@iee.email>
|
||||
|
||||
|
||||
* sa/cat-file-mailmap--batch-check (2023-01-18) 1 commit
|
||||
(merged to 'next' on 2023-01-18 at 25ecb1dd3a)
|
||||
+ git-cat-file.txt: fix list continuations rendering literally
|
||||
|
||||
Docfix.
|
||||
source: <20230118082749.1252459-1-martin.agren@gmail.com>
|
||||
|
||||
|
||||
* tb/t0003-invoke-dd-more-portably (2023-01-22) 1 commit
|
||||
(merged to 'next' on 2023-01-23 at 917aa24a27)
|
||||
+ t0003: call dd with portable blocksize
|
||||
|
||||
Test portability fix.
|
||||
source: <20230122062839.14542-1-tboegi@web.de>
|
||||
|
||||
|
||||
--------------------------------------------------
|
||||
[New Topics]
|
||||
|
||||
* ds/scalar-ignore-cron-error (2023-01-27) 3 commits
|
||||
- scalar: only warn when background maintenance fails
|
||||
- t921*: test scalar behavior starting maintenance
|
||||
- t: allow 'scalar' in test_must_fail
|
||||
* ab/imap-send-requires-curl (2023-02-02) 6 commits
|
||||
- imap-send: correctly report "host" when using "tunnel"
|
||||
- imap-send: remove old --no-curl codepath
|
||||
- imap-send: make --curl no-optional
|
||||
- imap-send: replace auto-probe libcurl with hard dependency
|
||||
- imap-send doc: the imap.sslVerify is used with imap.tunnel
|
||||
- imap-send: note "auth_method", not "host" on auth method failure
|
||||
|
||||
Allow "scalar" to warn but continue when its periodic maintenance
|
||||
feature cannot be enabled.
|
||||
Give a hard dependency on cURL library to build "git imap-send",
|
||||
and remove the code to interact with IMAP server without using cURL.
|
||||
|
||||
Comments?
|
||||
source: <cover-v2-0.6-00000000000-20230202T093706Z-avarab@gmail.com>
|
||||
|
||||
|
||||
* gc/index-format-doc (2023-02-01) 1 commit
|
||||
- docs: document zero bits in index "mode"
|
||||
|
||||
Doc update.
|
||||
|
||||
Will merge to 'next'.
|
||||
source: <pull.1473.git.1674849963.gitgitgadget@gmail.com>
|
||||
source: <20230201024041.29401-1-chooglen@google.com>
|
||||
|
||||
|
||||
* mh/doc-credential-cache-only-in-core (2023-01-29) 1 commit
|
||||
(merged to 'next' on 2023-01-30 at 021b5227af)
|
||||
+ Documentation: clarify that cache forgets credentials if the system restarts
|
||||
* jk/httpd-test-updates (2023-02-01) 4 commits
|
||||
- t/lib-httpd: increase ssl key size to 2048 bits
|
||||
- t/lib-httpd: drop SSLMutex config
|
||||
- t/lib-httpd: bump required apache version to 2.4
|
||||
- t/lib-httpd: bump required apache version to 2.2
|
||||
|
||||
Documentation clarification.
|
||||
Test update.
|
||||
|
||||
Will merge to 'master'.
|
||||
source: <pull.1447.v3.git.1674936815117.gitgitgadget@gmail.com>
|
||||
Will merge to 'next'.
|
||||
source: <Y9pOmR5fOfCHwYpF@coredump.intra.peff.net>
|
||||
|
||||
|
||||
* rd/doc-default-date-format (2023-02-01) 1 commit
|
||||
- rev-list: clarify git-log default date format
|
||||
|
||||
Update --date=default documentation.
|
||||
source: <20230201155712.86577-1-rafael@dulfer.be>
|
||||
|
||||
|
||||
* ew/free-island-marks (2023-02-02) 1 commit
|
||||
- delta-islands: free island_marks and bitmaps
|
||||
|
||||
"git pack-objects" learned to release delta-island bitmap data when
|
||||
it is done using it, saving peak heap memory usage.
|
||||
|
||||
Will merge to 'next'.
|
||||
source: <20230202094217.M955476@dcvr>
|
||||
|
||||
|
||||
* hj/remove-msys-support (2023-02-02) 2 commits
|
||||
- mingw: remove msysGit/MSYS1 support
|
||||
- mingw: remove duplicate `USE_NED_ALLOCATOR` directive
|
||||
|
||||
Remove support for MSys, which now lags way behind MSys2.
|
||||
|
||||
Will merge to 'next'.
|
||||
source: <pull.1433.v2.git.1675309898.gitgitgadget@gmail.com>
|
||||
|
||||
|
||||
* sk/winansi-createthread-fix (2023-02-01) 1 commit
|
||||
- compat/winansi: check for errors of CreateThread() correctly
|
||||
|
||||
Fix use of CreateThread() API call made early in the windows
|
||||
start-up code.
|
||||
|
||||
Will merge to 'next'.
|
||||
source: <pull.1445.v4.git.git.1675290034144.gitgitgadget@gmail.com>
|
||||
|
||||
--------------------------------------------------
|
||||
[Stalled]
|
||||
|
||||
* rj/branch-unborn-in-other-worktrees (2023-01-19) 3 commits
|
||||
- branch: rename orphan branches in any worktree
|
||||
- branch: description for orphan branch errors
|
||||
- avoid unnecessary worktrees traversing
|
||||
|
||||
Error messages given when working on an unborn branch that is
|
||||
checked out in another worktree have been improvved.
|
||||
|
||||
Expecting a reroll.
|
||||
cf. <527f7315-be7b-7ec0-04fc-d07da7d4fefa@gmail.com>
|
||||
source: <34a58449-4f2e-66ef-ea01-119186aebd23@gmail.com>
|
||||
|
||||
|
||||
* ja/worktree-orphan (2023-01-13) 4 commits
|
||||
- worktree add: add hint to direct users towards --orphan
|
||||
- worktree add: add --orphan flag
|
||||
@@ -281,23 +214,6 @@ Release tarballs are available at:
|
||||
source: <cover-0.4-00000000000-20221118T113442Z-avarab@gmail.com>
|
||||
|
||||
|
||||
* ab/config-multi-and-nonbool (2022-11-27) 9 commits
|
||||
- for-each-repo: with bad config, don't conflate <path> and <cmd>
|
||||
- config API: add "string" version of *_value_multi(), fix segfaults
|
||||
- config API users: test for *_get_value_multi() segfaults
|
||||
- for-each-repo: error on bad --config
|
||||
- config API: have *_multi() return an "int" and take a "dest"
|
||||
- versioncmp.c: refactor config reading next commit
|
||||
- config tests: add "NULL" tests for *_get_value_multi()
|
||||
- config tests: cover blind spots in git_die_config() tests
|
||||
- for-each-repo tests: test bad --config keys
|
||||
|
||||
Assorted config API updates.
|
||||
|
||||
Expecting a reroll.
|
||||
source: <cover-v3-0.9-00000000000-20221125T093158Z-avarab@gmail.com>
|
||||
|
||||
|
||||
* ed/fsmonitor-inotify (2022-12-13) 6 commits
|
||||
- fsmonitor: update doc for Linux
|
||||
- fsmonitor: test updates
|
||||
@@ -346,6 +262,45 @@ Release tarballs are available at:
|
||||
--------------------------------------------------
|
||||
[Cooking]
|
||||
|
||||
* ab/config-multi-and-nonbool (2023-02-02) 9 commits
|
||||
- for-each-repo: with bad config, don't conflate <path> and <cmd>
|
||||
- config API: add "string" version of *_value_multi(), fix segfaults
|
||||
- config API users: test for *_get_value_multi() segfaults
|
||||
- for-each-repo: error on bad --config
|
||||
- config API: have *_multi() return an "int" and take a "dest"
|
||||
- versioncmp.c: refactor config reading next commit
|
||||
- config API: add and use a "git_config_get()" family of functions
|
||||
- config tests: add "NULL" tests for *_get_value_multi()
|
||||
- config tests: cover blind spots in git_die_config() tests
|
||||
|
||||
Assorted config API updates.
|
||||
|
||||
source: <cover-v4-0.9-00000000000-20230202T131155Z-avarab@gmail.com>
|
||||
|
||||
|
||||
* ds/scalar-ignore-cron-error (2023-01-27) 3 commits
|
||||
(merged to 'next' on 2023-01-31 at 98d13ac3e7)
|
||||
+ scalar: only warn when background maintenance fails
|
||||
+ t921*: test scalar behavior starting maintenance
|
||||
+ t: allow 'scalar' in test_must_fail
|
||||
|
||||
Allow "scalar" to warn but continue when its periodic maintenance
|
||||
feature cannot be enabled.
|
||||
|
||||
Will merge to 'master'.
|
||||
source: <pull.1473.git.1674849963.gitgitgadget@gmail.com>
|
||||
|
||||
|
||||
* mh/doc-credential-cache-only-in-core (2023-01-29) 1 commit
|
||||
(merged to 'next' on 2023-01-30 at 021b5227af)
|
||||
+ Documentation: clarify that cache forgets credentials if the system restarts
|
||||
|
||||
Documentation clarification.
|
||||
|
||||
Will merge to 'master'.
|
||||
source: <pull.1447.v3.git.1674936815117.gitgitgadget@gmail.com>
|
||||
|
||||
|
||||
* ab/hook-api-with-stdin (2023-01-23) 5 commits
|
||||
- hook: support a --to-stdin=<path> option for testing
|
||||
- sequencer: use the new hook API for the simpler "post-rewrite" call
|
||||
@@ -403,17 +358,15 @@ Release tarballs are available at:
|
||||
source: <20230125234725.3918563-1-gwymor@tilde.club>
|
||||
|
||||
|
||||
* cb/grep-fallback-failing-jit (2023-01-30) 2 commits
|
||||
- SQUASH???
|
||||
* cb/grep-fallback-failing-jit (2023-01-31) 1 commit
|
||||
- grep: fall back to interpreter if JIT memory allocation fails
|
||||
|
||||
In an environment where dynamically generated code is prohibited to
|
||||
run (e.g. SELinux), failure to JIT pcre patterns is expected. Fall
|
||||
back to interpreted execution in such a case.
|
||||
|
||||
Expecting a (hopefully final minor) reroll.
|
||||
cf. <xmqqlelj3hvk.fsf@gitster.g>
|
||||
source: <20230127154952.485913-1-minipli@grsecurity.net>
|
||||
Will merge to 'next'?
|
||||
source: <20230131185611.520311-1-minipli@grsecurity.net>
|
||||
|
||||
|
||||
* cb/checkout-same-branch-twice (2023-01-20) 1 commit
|
||||
@@ -422,7 +375,7 @@ Release tarballs are available at:
|
||||
"git checkout -B $branch" failed to protect against checking out
|
||||
a branch that is checked out elsewhere, unlike "git branch -f" did.
|
||||
|
||||
Expecting a (hopefully final) reroll.
|
||||
Expecting a hopefully minor and final reroll.
|
||||
cf. <8f24fc3c-c30f-dc70-5a94-5ee4ed3de102@dunelm.org.uk>
|
||||
source: <20230120113553.24655-1-carenas@gmail.com>
|
||||
|
||||
@@ -463,7 +416,7 @@ Release tarballs are available at:
|
||||
branch that is being used in another worktree linked to the same
|
||||
repository.
|
||||
|
||||
Expecting a (hopefully final) reroll.
|
||||
Expecting a hopefully minor and final reroll.
|
||||
cf. <d61a2393-64c8-da49-fe13-00bc4a52d5e3@gmail.com>
|
||||
source: <f7f45f54-9261-45ea-3399-8ba8dee6832b@gmail.com>
|
||||
|
||||
@@ -500,12 +453,12 @@ Release tarballs are available at:
|
||||
"git send-email" learned to give the e-mail headers to the validate
|
||||
hook by passing an extra argument from the command line.
|
||||
|
||||
Expecting a (hopefully final) reroll.
|
||||
Expecting a hopefully minor and final reroll.
|
||||
cf. <c1ba0a28-3c39-b313-2757-dceb02930334@amd.com>
|
||||
source: <20230120012459.920932-1-michael.strawbridge@amd.com>
|
||||
|
||||
|
||||
* ds/bundle-uri-5 (2023-01-23) 10 commits
|
||||
* ds/bundle-uri-5 (2023-01-31) 11 commits
|
||||
- bundle-uri: test missing bundles with heuristic
|
||||
- bundle-uri: store fetch.bundleCreationToken
|
||||
- fetch: fetch from an external bundle URI
|
||||
@@ -515,16 +468,14 @@ Release tarballs are available at:
|
||||
- bundle-uri: parse bundle.<id>.creationToken values
|
||||
- bundle-uri: parse bundle.heuristic=creationToken
|
||||
- t5558: add tests for creationToken heuristic
|
||||
- bundle: optionally skip reachability walk
|
||||
- bundle: verify using check_connected()
|
||||
- bundle: test unbundling with incomplete history
|
||||
|
||||
The bundle-URI subsystem adds support for creation-token heuristics
|
||||
to help incremental fetches.
|
||||
|
||||
Expecting a reroll.
|
||||
cf. <771a2993-85bd-0831-0977-24204f84e206@github.com>
|
||||
cf. <01f97aff-58a1-ef2c-e668-d37ea513c64e@github.com>
|
||||
cf. <ecc6b167-f5c4-48ce-3973-461d1659ed40@github.com>
|
||||
source: <pull.1454.v2.git.1674487310.gitgitgadget@gmail.com>
|
||||
Will merge to 'next'?
|
||||
source: <pull.1454.v3.git.1675171759.gitgitgadget@gmail.com>
|
||||
|
||||
|
||||
* tc/cat-file-z-use-cquote (2023-01-16) 1 commit
|
||||
@@ -556,12 +507,12 @@ Release tarballs are available at:
|
||||
source: <20230104215415.1083526-1-calvinwan@google.com>
|
||||
|
||||
|
||||
* ab/various-leak-fixes (2023-01-18) 19 commits
|
||||
* ab/various-leak-fixes (2023-02-02) 19 commits
|
||||
- push: free_refs() the "local_refs" in set_refspecs()
|
||||
- push: refactor refspec_append_mapped() for subsequent leak-fix
|
||||
- receive-pack: free() the "ref_name" in "struct command"
|
||||
- grep API: plug memory leaks by freeing "header_list"
|
||||
- grep.c: refactor free_grep_patterns()
|
||||
- object-file.c: release the "tag" in check_tag()
|
||||
- builtin/merge.c: free "&buf" on "Your local changes..." error
|
||||
- builtin/merge.c: use fixed strings, not "strbuf", fix leak
|
||||
- show-branch: free() allocated "head" before return
|
||||
@@ -579,22 +530,12 @@ Release tarballs are available at:
|
||||
|
||||
Leak fixes.
|
||||
|
||||
Needs review.
|
||||
source: <cover-v5-00.19-00000000000-20230118T120334Z-avarab@gmail.com>
|
||||
Comments?
|
||||
source: <cover-v6-00.19-00000000000-20230202T094704Z-avarab@gmail.com>
|
||||
|
||||
|
||||
* rj/branch-unborn-in-other-worktrees (2023-01-19) 3 commits
|
||||
- branch: rename orphan branches in any worktree
|
||||
- branch: description for orphan branch errors
|
||||
- avoid unnecessary worktrees traversing
|
||||
|
||||
Error messages given when working on an unborn branch that is
|
||||
checked out in another worktree have been improvved.
|
||||
|
||||
Expecting a reroll.
|
||||
cf. <527f7315-be7b-7ec0-04fc-d07da7d4fefa@gmail.com>
|
||||
source: <34a58449-4f2e-66ef-ea01-119186aebd23@gmail.com>
|
||||
|
||||
--------------------------------------------------
|
||||
[Discarded]
|
||||
|
||||
* mc/credential-helper-auth-headers (2023-01-20) 12 commits
|
||||
(merged to 'next' on 2023-01-25 at cb95006bb2)
|
||||
@@ -613,73 +554,7 @@ Release tarballs are available at:
|
||||
|
||||
Extending credential helper protocol.
|
||||
|
||||
Will kick out of 'next'. The test-only server is an eyesore.
|
||||
The test-only server is an eyesore.
|
||||
cf. <e57c1ca3-c21c-db41-a386-e5887f46055c@github.com>
|
||||
cf. <Y9JkMLueCwjkLHOr@coredump.intra.peff.net>
|
||||
source: <pull.1352.v7.git.1674252530.gitgitgadget@gmail.com>
|
||||
|
||||
--------------------------------------------------
|
||||
[Discarded]
|
||||
|
||||
* jc/ci-deprecated-declarations-are-not-fatal (2023-01-14) 1 commit
|
||||
(merged to 'next' on 2023-01-14 at 5efb778ab0)
|
||||
+ ci: do not die on deprecated-declarations warning
|
||||
|
||||
CI build fix for overzealous -Werror.
|
||||
|
||||
Reverted out of 'next'
|
||||
Preferring jk/curl-avoid-deprecated-api that fixes the code properly.
|
||||
source: <xmqq7cxpkpjp.fsf@gitster.g>
|
||||
|
||||
|
||||
* po/pretty-hard-trunc (2022-11-13) 1 commit
|
||||
. pretty-formats: add hard truncation, without ellipsis, options
|
||||
|
||||
Add a new pretty format which truncates without ellipsis.
|
||||
|
||||
Superseded by the 'po/pretty-format-columns-doc' topic.
|
||||
source: <20221112143616.1429-1-philipoakley@iee.email>
|
||||
|
||||
|
||||
* en/rebase-update-refs-needs-merge-backend (2023-01-22) 9 commits
|
||||
(merged to 'next' on 2023-01-23 at 1b65346647)
|
||||
+ rebase: provide better error message for apply options vs. merge config
|
||||
+ rebase: put rebase_options initialization in single place
|
||||
+ rebase: fix formatting of rebase --reapply-cherry-picks option in docs
|
||||
+ rebase: clarify the OPT_CMDMODE incompatibilities
|
||||
+ rebase: add coverage of other incompatible options
|
||||
+ rebase: fix docs about incompatibilities with --root
|
||||
+ rebase: remove --allow-empty-message from incompatible opts
|
||||
+ rebase: flag --apply and --merge as incompatible
|
||||
+ rebase: mark --update-refs as requiring the merge backend
|
||||
|
||||
The "--update-refs" feature of "git rebase" requires the use of the
|
||||
merge backend, while "--whitespace=fix" feature does not work with
|
||||
the said backend. Notice the combination and error out, instead of
|
||||
silently ignoring one of the features requested.
|
||||
|
||||
Reverted out of 'next' to be replaced with en/rebase-incompatible-opts
|
||||
source: <pull.1466.v4.git.1674367961.gitgitgadget@gmail.com>
|
||||
|
||||
|
||||
* rs/tree-parse-mode-overflow-check (2023-01-21) 1 commit
|
||||
. tree-walk: disallow overflowing modes
|
||||
|
||||
Reject tree objects with entries whose mode bits are overly wide.
|
||||
|
||||
Retracted.
|
||||
cf. <b4b48877-5b80-e96f-d09f-2fe275f42950@web.de>
|
||||
source: <d673fde7-7eb2-6306-86b6-1c1a4c988ee8@web.de>
|
||||
|
||||
|
||||
* cc/filtered-repack (2022-12-25) 3 commits
|
||||
. gc: add gc.repackFilter config option
|
||||
. repack: add --filter=<filter-spec> option
|
||||
. pack-objects: allow --filter without --stdout
|
||||
|
||||
"git repack" learns to discard objects that ought to be retrievable
|
||||
again from the promisor remote.
|
||||
|
||||
May want to discard. Its jaggy edges may be a bit too sharp.
|
||||
cf. <Y7WTv19aqiFCU8au@ncase>
|
||||
source: <20221221040446.2860985-1-christian.couder@gmail.com>
|
||||
|
||||
Reference in New Issue
Block a user