Skip to content

G
git

李少辉-开发者 / git
与 Fork 源项目一致

从无法访问的项目Fork

通知 2
Star 1
Fork 0
G
git

前往新版Gitcode，体验更适合开发者的 AI 搜索 >>

提交 e1632a31 编写于 作者: J Junio C Hamano
浏览文件
操作

What's cooking (2020/09 #06)

上级 571a3d10
隐藏空白更改
内联 并排
Showing with 193 addition and 306 deletion
whats-cooking.txt
浏览文件 @ e1632a31
To: git@vger.kernel.org
Bcc: lwn@lwn.net
Subject: What's cooking in git.git (Sep 2020, #05; Fri, 18)
X-master-at: 385c171a018f2747b329bcfa6be8eda1709e5abd
X-next-at: 8d73e042082d7476596b06e00a6c3d1828fa6b49
Subject: What's cooking in git.git (Sep 2020, #06; Tue, 22)
X-master-at: e1cfff676549cdcd702cbac105468723ef2722f4
X-next-at: 8561365e88e520292a0612ade20fec91b7b4cabd
What's cooking in git.git (Sep 2020, #05; Fri, 18)
What's cooking in git.git (Sep 2020, #06; Tue, 22)
--------------------------------------------------
Here are the topics that have been cooking. Commits prefixed with '-' are
......@@ -20,227 +20,180 @@ repositories listed at
--------------------------------------------------
[Graduated to 'master']
* al/t3200-back-on-a-branch (2020-09-08) 1 commit
(merged to 'next' on 2020-09-09 at 833e2fc60c)
+ t3200: clean side effect of git checkout --orphan
Test fix.
* ea/blame-use-oideq (2020-09-08) 1 commit
(merged to 'next' on 2020-09-09 at babefe4727)
+ blame.c: replace instance of !oidcmp for oideq
Code cleanup.
* es/wt-add-detach (2020-09-06) 3 commits
(merged to 'next' on 2020-09-10 at abd83f90e7)
+ git-worktree.txt: discuss branch-based vs. throwaway worktrees
+ worktree: teach `add` to recognize -d as shorthand for --detach
+ git-checkout.txt: document -d short option for --detach
"git worktree add" learns that the "-d" is a synonym to "--detach"
option to create a new worktree without being on a branch.
* hn/refs-ref-log-only-bit (2020-09-08) 1 commit
(merged to 'next' on 2020-09-09 at f729cb2c81)
+ refs: move REF_LOG_ONLY to refs-internal.h
A bit of API reshuffling to make sure stuff common to all backends
are not defined only in files backend.
* jc/add-i-use-builtin-experimental (2020-09-08) 1 commit
(merged to 'next' on 2020-09-09 at abcb7515dc)
+ add -i: use the built-in version when feature.experimental is set
* al/ref-filter-merged-and-no-merged (2020-09-18) 5 commits
(merged to 'next' on 2020-09-18 at cc2a0039f3)
+ Doc: prefer more specific file name
+ ref-filter: make internal reachable-filter API more precise
(merged to 'next' on 2020-09-16 at b04e306660)
+ ref-filter: allow merged and no-merged filters
+ Doc: cover multiple contains/no-contains filters
+ t3201: test multiple branch filter combinations
The "add -i/-p" machinery has been written in C but it is not used
by default yet. It is made default to those who are participating
in feature.experimental experiment.
"git for-each-ref" and friends that list refs used to allow only
one --merged or --no-merged to filter them; they learned to take
combination of both kind of filtering.
* jc/dist-tarball-tweak (2020-09-09) 1 commit
(merged to 'next' on 2020-09-10 at 36cbe7ee9e)
+ Makefile: allow extra tweaking of distribution tarball
* ar/fetch-ipversion-in-all (2020-09-15) 1 commit
(merged to 'next' on 2020-09-21 at 0da2438668)
+ fetch: pass --ipv4 and --ipv6 options to sub-fetches
Allow maintainers to tweak $(TAR) invocations done while making
distribution tarballs.
"git fetch --all --ipv4/--ipv6" forgot to pass the protocol options
to instances of the "git fetch" that talk to individual remotes,
which has been corrected.
* jc/quote-path-cleanup (2020-09-10) 7 commits
(merged to 'next' on 2020-09-10 at 3bfde81846)
+ quote: turn 'nodq' parameter into a set of flags
+ quote: rename misnamed sq_lookup[] to cq_lookup[]
+ wt-status: consistently quote paths in "status --short" output
+ quote_path: code clarification
+ quote_path: optionally allow quoting a path with SP in it
+ quote_path: give flags parameter to quote_path()
+ quote_path: rename quote_path_relative() to quote_path()
* cd/commit-graph-doc (2020-09-15) 1 commit
(merged to 'next' on 2020-09-16 at b0816b6eb0)
+ commit-graph-format.txt: fix no-parent value
"git status --short" quoted a path with SP in it when tracked, but
not those that are untracked, ignored or unmerged. They are all
shown quoted consistently.
Doc update.
* jk/add-i-fixes (2020-09-08) 2 commits
(merged to 'next' on 2020-09-09 at 46ea071a7a)
+ add--interactive.perl: specify --no-color explicitly
+ add-patch: fix inverted return code of repo_read_index()
* cs/don-t-pretend-a-failed-remote-set-head-succeeded (2020-09-17) 1 commit
(merged to 'next' on 2020-09-18 at 51f73ca6dc)
+ remote: don't show success message when set-head fails
"add -i/-p" fixes.
"git remote set-head" that failed still said something that hints
the operation went through, which was misleading.
* mf/submodule-summary-with-correct-repository (2020-06-24) 2 commits
(merged to 'next' on 2020-09-10 at 7853fe7e12)
+ submodule: use submodule repository when preparing summary
+ revision: use repository from rev_info when parsing commits
* dl/complete-format-patch-recent-features (2020-09-17) 1 commit
(merged to 'next' on 2020-09-18 at c0ec1f7569)
+ contrib/completion: complete options that take refs for format-patch
"git diff/show" on a change that involves a submodule used to read
the information on commits in the submodule from a wrong repository
and gave a wrong information when the commit-graph is involved.
cf. <xmqqzh667ca4.fsf@gitster.c.googlers.com>
Update to command line completion (in contrib/)
* mt/config-fail-nongit-early (2020-09-09) 1 commit
(merged to 'next' on 2020-09-10 at 6f77f65b4e)
+ config: complain about --worktree outside of a git repo
* es/format-patch-interdiff-cleanup (2020-09-08) 3 commits
(merged to 'next' on 2020-09-16 at d919bb3d1f)
+ format-patch: use 'origin' as start of current-series-range when known
+ diff-lib: tighten show_interdiff()'s interface
+ diff: move show_interdiff() from its own file to diff-lib
Unlike "git config --local", "git config --worktree" did not fail
early and cleanly when started outside a git repository.
"format-patch --range-diff=<prev> <origin>..HEAD" has been taught
not to ignore <origin> when <prev> is a single version.
* os/collect-changed-submodules-optim (2020-09-06) 1 commit
(merged to 'next' on 2020-09-10 at b6d9ed060e)
+ submodule: suppress checking for file name and ref ambiguity for object ids
* hn/refs-trace-backend (2020-09-09) 1 commit
(merged to 'next' on 2020-09-16 at f2e065ec17)
+ refs: add GIT_TRACE_REFS debugging mechanism
Optimization around submodule handling.
Developer support.
* pb/clang-json-compilation-database (2020-09-06) 1 commit
(merged to 'next' on 2020-09-09 at 9f5ea136f1)
+ Makefile: add support for generating JSON compilation database
* jk/dont-count-existing-objects-twice (2020-09-17) 1 commit
(merged to 'next' on 2020-09-18 at 73b30558b9)
+ packfile: actually set approximate_object_count_valid
Developer support.
There is a logic to estimate how many objects are in the
repository, which is mean to run once per process invocation, but
it ran every time the estimated value was requested.
* pw/add-p-leakfix (2020-09-08) 1 commit
(merged to 'next' on 2020-09-09 at 4206d0503c)
+ add -p: fix memory leak
* jt/threaded-index-pack (2020-09-08) 7 commits
(merged to 'next' on 2020-09-16 at 8542385cc0)
+ index-pack: make quantum of work smaller
+ index-pack: make resolve_delta() assume base data
+ index-pack: calculate {ref,ofs}_{first,last} early
+ index-pack: remove redundant child field
+ index-pack: unify threaded and unthreaded code
+ index-pack: remove redundant parameter
+ Documentation: deltaBaseCacheLimit is per-thread
Leakfix.
"git index-pack" learned to resolve deltified objects with greater
parallelism.
* rs/misc-cleanups (2020-09-06) 3 commits
(merged to 'next' on 2020-09-09 at 4a19ea9672)
+ pack-bitmap-write: use hashwrite_be32() in write_hash_cache()
+ midx: use hashwrite_u8() in write_midx_header()
+ fast-import: use write_pack_header()
* kk/build-portability-fix (2020-09-09) 1 commit
(merged to 'next' on 2020-09-16 at 63f2672632)
+ Fit to Plan 9's ANSI/POSIX compatibility layer
Misc cleanups.
Portability tweak for some shell scripts used while building.
* rs/parallel-read-cache-fix (2020-09-06) 1 commit
(merged to 'next' on 2020-09-09 at 92953a75c4)
+ read-cache: fix mem-pool allocation for multi-threaded index loading
* ls/mergetool-meld-auto-merge (2020-09-16) 1 commit
(merged to 'next' on 2020-09-16 at 01985a671b)
+ mergetool: allow auto-merge for meld to follow the vim-diff behavior
A follow-up fix to a topic already in 'master'.
The 'meld' backend of the "git mergetool" learned to give the
underlying 'meld' the '--auto-merge' option, which would help
reduce the amount of text that requires manual merging.
* rs/refspec-leakfix (2020-09-06) 2 commits
(merged to 'next' on 2020-09-09 at 10741e90a5)
+ refspec: add and use refspec_appendf()
+ push: release strbufs used for refspec formatting
* os/fetch-submodule-optim (2020-09-06) 1 commit
(merged to 'next' on 2020-09-16 at fa39e3f211)
+ fetch: do not look for submodule changes in unchanged refs
Leakfix.
Optimization around submodule handling.
* so/log-tree-diff-cleanup (2020-09-06) 2 commits
(merged to 'next' on 2020-09-09 at f8744b8e8a)
+ log_tree_diff: get rid of extra check for NULL
+ log_tree_diff: get rid of code duplication for first_parent_only
* pw/add-p-edit-ita-path (2020-09-09) 1 commit
(merged to 'next' on 2020-09-16 at 7540ed3c0e)
+ add -p: fix editing of intent-to-add paths
Code cleanup.
"add -p" now allows editing paths that were only added in intent.
--------------------------------------------------
[New Topics]
* cs/don-t-pretend-a-failed-remote-set-head-succeeded (2020-09-17) 1 commit
(merged to 'next' on 2020-09-18 at 51f73ca6dc)
+ remote: don't show success message when set-head fails
* ld/p4-unshelve-fix (2020-09-19) 2 commits
(merged to 'next' on 2020-09-22 at c7709a34ec)
+ git-p4: use HEAD~$n to find parent commit for unshelve
+ git-p4 unshelve: adding a commit breaks git-p4 unshelve
"git remote set-head" that failed still said something that hints
the operation went through, which was misleading.
The "unshelve" subcommand of "git p4" used incorrectly used
commit^N where it meant to say commit~N to name the Nth generation
ancestor, which has been corrected.
Will merge to 'master'.
* dl/diff-merge-base (2020-09-17) 10 commits
- contrib/completion: complete `git diff --merge-base`
- builtin/diff-tree: learn --merge-base
- builtin/diff-index: learn --merge-base
- t4068: add --merge-base tests
- diff-lib: define diff_get_merge_base()
- diff-lib: accept option flags in run_diff_index()
- contrib/completion: extract common diff/difftool options
- git-diff.txt: backtick quote command text
- git-diff-index.txt: make --cached description a proper sentence
- t4068: remove unnecessary >tmp
"git diff A...B" learned "git diff --merge-base A B", which is a
longer short-hand to say the same thing.
* rs/archive-add-file (2020-09-19) 3 commits
- Makefile: use git-archive --add-file
- archive: add --add-file
- archive: read short blobs in archive.c::write_archive_entry()
Expecting a reroll.
cf. <20200917181303.GA108156@coredump.intra.peff.net>,
<xmqqh7rws5hm.fsf@gitster.c.googlers.com>, etc.
"git archive" learns the "--add-file" option to include untracked
files into a snapshot from a tree-ish.
* jk/dont-count-existing-objects-twice (2020-09-17) 1 commit
(merged to 'next' on 2020-09-18 at 73b30558b9)
+ packfile: actually set approximate_object_count_valid
* jk/diff-highlight-blank-match-fix (2020-09-21) 1 commit
(merged to 'next' on 2020-09-22 at 03ac708501)
+ diff-highlight: correctly match blank lines for flush
There is a logic to estimate how many objects are in the
repository, which is mean to run once per process invocation, but
it ran every time the estimated value was requested.
"diff-highlight" (in contrib/) had a logic to flush its output upon
seeing a blank line but the way it detected a blank line was broken.
Will merge to 'master'.
* dl/complete-format-patch-recent-features (2020-09-17) 1 commit
(merged to 'next' on 2020-09-18 at c0ec1f7569)
+ contrib/completion: complete options that take refs for format-patch
Update to command line completion (in contrib/)
Will merge to 'master'.
* js/default-branch-name-part-2 (2020-09-21) 5 commits
- t9902: avoid using the branch name `master`
- tests: avoid variations of the `master` branch name
- t3200: avoid variations of the `master` branch name
- fast-export: avoid using unnecessary language in a code comment
- t/test-terminal: avoid non-inclusive language
Update the tests to drop word 'master' from them
* js/ignore-cmake-build-artifacts (2020-09-17) 1 commit
- cmake: ignore generated files
Running CMake based build with VS (in contrib/) from the top-level
of the working tree leaves extra build crufts behind. Add patterns
to .gitignore
* jt/keep-partial-clone-filter-upon-lazy-fetch (2020-09-21) 2 commits
- fetch: do not override partial clone filter
- promisor-remote: remove unused variable
Expecting a resolution in a better way.
cf. <xmqq7dsrnjhi.fsf@gitster.c.googlers.com>
It turns out that these crufts are visible only when the CMake
based build procedure is used against the best practice. A better
alternative may be to prominently describe the recommended way to
use the CMake-based build procedure.
The lazy fetching done internally to make missing objects available
in a partial clone incorrectly made permanent damate to the partial
clone filter in the repository, which has been corrected.
* hx/push-atomic-with-cert (2020-09-18) 1 commit
- send-pack: run GPG after atomic push checking
* rs/misc-cleanups (2020-09-19) 1 commit
(merged to 'next' on 2020-09-22 at d034fbfab0)
+ pack-write: use hashwrite_be32() in write_idx_file()
"git push" that wants to be atomic and wants to send push
certificate learned not to prepare and sign the push certificate
when it fails the local check (hence due to atomicity it is known
that no certificate is needed).
Code cleanup.
Expecting a reroll.
cf. <xmqqft7eljkz.fsf@gitster.c.googlers.com>
Will merge to 'master'.
--------------------------------------------------
[Stalled]
......@@ -288,40 +241,58 @@ repositories listed at
--------------------------------------------------
[Cooking]
* kk/build-portability-fix (2020-09-09) 1 commit
(merged to 'next' on 2020-09-16 at 63f2672632)
+ Fit to Plan 9's ANSI/POSIX compatibility layer
* dl/diff-merge-base (2020-09-21) 10 commits
- contrib/completion: complete `git diff --merge-base`
- builtin/diff-tree: learn --merge-base
- builtin/diff-index: learn --merge-base
- t4068: add --merge-base tests
- diff-lib: define diff_get_merge_base()
- diff-lib: accept option flags in run_diff_index()
- contrib/completion: extract common diff/difftool options
- git-diff.txt: backtick quote command text
- git-diff-index.txt: make --cached description a proper sentence
- t4068: remove unnecessary >tmp
Portability tweak for some shell scripts used while building.
"git diff A...B" learned "git diff --merge-base A B", which is a
longer short-hand to say the same thing.
Will merge to 'master'.
* js/ignore-cmake-build-artifacts (2020-09-17) 1 commit
- cmake: ignore generated files
* al/ref-filter-merged-and-no-merged (2020-09-18) 5 commits
(merged to 'next' on 2020-09-18 at cc2a0039f3)
+ Doc: prefer more specific file name
+ ref-filter: make internal reachable-filter API more precise
(merged to 'next' on 2020-09-16 at b04e306660)
+ ref-filter: allow merged and no-merged filters
+ Doc: cover multiple contains/no-contains filters
+ t3201: test multiple branch filter combinations
Running CMake based build with VS (in contrib/) from the top-level
of the working tree leaves extra build crufts behind. Add patterns
to .gitignore
Expecting a resolution in a better way.
cf. <xmqq7dsrnjhi.fsf@gitster.c.googlers.com>
It turns out that these crufts are visible only when the CMake
based build procedure is used against the best practice. A better
alternative may be to prominently describe the recommended way to
use the CMake-based build procedure.
"git for-each-ref" and friends that list refs used to allow only
one --merged or --no-merged to filter them; they learned to take
combination of both kind of filtering.
* hx/push-atomic-with-cert (2020-09-19) 1 commit
(merged to 'next' on 2020-09-22 at 64561eea5b)
+ send-pack: run GPG after atomic push checking
"git push" that wants to be atomic and wants to send push
certificate learned not to prepare and sign the push certificate
when it fails the local check (hence due to atomicity it is known
that no certificate is needed).
Will merge to 'master'.
* bc/faq-misc (2020-09-14) 3 commits
- docs: explain how to deal with files that are always modified
- docs: explain why reverts are not always applied on merge
- docs: explain why squash merges are broken with long-running branches
* bc/faq-misc (2020-09-20) 3 commits
(merged to 'next' on 2020-09-22 at a81b728010)
+ docs: explain how to deal with files that are always modified
+ docs: explain why reverts are not always applied on merge
+ docs: explain why squash merges are broken with long-running branches
More FAQ entries.
Expecting a reroll.
cf. <20200913171206.GO241078@camp.crustytoothpaste.net>
Will merge to 'master'.
* sb/clone-origin (2020-09-11) 4 commits
......@@ -337,18 +308,23 @@ repositories listed at
Expecting an update.
* sk/force-if-includes (2020-09-14) 8 commits
- SQUASH???
- t: add tests for "force-if-includes"
- doc: add reference for "--[no-]force-if-includes"
- builtin/push: add option "--[no-]force-if-includes"
- transport-helper: update ref status for "force-if-includes"
- send-pack: check ref status for "force-if-includes"
- transport: add flag for "--[no-]force-if-includes"
- remote: add reflog check for "force-if-includes"
* sk/force-if-includes (2020-09-19) 3 commits
- t, doc: update tests, reference for "--force-if-includes"
- push: parse and set flag for "--force-if-includes"
- push: add reflog check for "--force-if-includes"
"git push --force-with-lease[=<ref>]" can easily be misused to lose
commits unless the user takes good care of their own "git fetch".
A new option "--force-if-includes" attempts to ensure that what is
being force-pushed was created after examining the commit at the
tip of the remote ref that is about to be force-replaced.
* ab/mediawiki-fixes (2020-09-16) 15 commits
* ab/mediawiki-fixes (2020-09-21) 18 commits
- remote-mediawiki: use "sh" to eliminate unquoted commands
- remote-mediawiki: annotate unquoted uses of run_git()
- remote-mediawiki: convert to quoted run_git() invocation
- remote-mediawiki: provide a list form of run_git()
- remote-mediawiki tests: annotate failing tests
- remote-mediawiki: fix duplicate revisions being imported
- remote-mediawiki tests: use CLI installer
......@@ -357,26 +333,15 @@ repositories listed at
- remote-mediawiki tests: use a more idiomatic dispatch table
- remote-mediawiki tests: use "$dir/" instead of "$dir."
- remote-mediawiki tests: change `[]` to `test`
- remote-mediawiki tests: guard test_cmp with test_path_is_file
- remote-mediawiki tests: use test_cmp in tests
- remote-mediawiki tests: use a 10 character password
- remote-mediawiki tests: use the login/password variables
- remote-mediawiki doc: bump recommended PHP version to 7.3
- remote-mediawiki doc: don't hardcode Debian PHP versions
- remote-mediawiki doc: link to MediaWiki's current version
- remote-mediawiki doc: correct link to GitHub project
Modernization and fixes to MediaWiki remote backend.
Expecting a reroll.
* ar/fetch-ipversion-in-all (2020-09-15) 1 commit
- fetch: pass --ipv4 and --ipv6 options to sub-fetches
"git fetch --all --ipv4/--ipv6" forgot to pass the protocol options
to instances of the "git fetch" that talk to individual remotes,
which has been corrected.
Will merge to 'next'.
......@@ -388,23 +353,15 @@ repositories listed at
Needs more work.
* bc/clone-with-git-default-hash-fix (2020-09-15) 1 commit
- builtin/clone: avoid failure with GIT_DEFAULT_HASH
* bc/clone-with-git-default-hash-fix (2020-09-22) 1 commit
(merged to 'next' on 2020-09-22 at 62ea45c20e)
+ builtin/clone: avoid failure with GIT_DEFAULT_HASH
"git clone" that clones from SHA-1 repository, while
GIT_DEFAULT_HASH set to use SHA-256 already, resulted in an
unusable repository that half-claims to be SHA-256 repository
with SHA-1 objects and refs. This has been corrected.
Expecting a reroll.
* cd/commit-graph-doc (2020-09-15) 1 commit
(merged to 'next' on 2020-09-16 at b0816b6eb0)
+ commit-graph-format.txt: fix no-parent value
Doc update.
Will merge to 'master'.
......@@ -445,67 +402,27 @@ repositories listed at
other scheduling system configuration) for it.
* es/format-patch-interdiff-cleanup (2020-09-08) 3 commits
(merged to 'next' on 2020-09-16 at d919bb3d1f)
+ format-patch: use 'origin' as start of current-series-range when known
+ diff-lib: tighten show_interdiff()'s interface
+ diff: move show_interdiff() from its own file to diff-lib
Code cleanup and teach "format-patch --range-diff=<prev>
<origin>..HEAD" not ignore <origin> when <prev> is a single
version.
Will merge to 'master'.
* os/fetch-submodule-optim (2020-09-06) 1 commit
(merged to 'next' on 2020-09-16 at fa39e3f211)
+ fetch: do not look for submodule changes in unchanged refs
Optimization around submodule handling.
Will merge to 'master'.
* pw/add-p-edit-ita-path (2020-09-09) 1 commit
(merged to 'next' on 2020-09-16 at 7540ed3c0e)
+ add -p: fix editing of intent-to-add paths
"add -p" did not allow editing paths that were only added in
intent.
Will merge to 'master'.
* hn/refs-trace-backend (2020-09-09) 1 commit
(merged to 'next' on 2020-09-16 at f2e065ec17)
+ refs: add GIT_TRACE_REFS debugging mechanism
Developer support.
Will merge to 'master'.
* tb/bloom-improvements (2020-09-18) 13 commits
- commit-graph: introduce 'commitGraph.maxNewFilters'
- builtin/commit-graph.c: introduce '--max-new-filters=<n>'
- commit-graph: rename 'split_commit_graph_opts'
- bloom: encode out-of-bounds filters as non-empty
- bloom/diff: properly short-circuit on max_changes
- bloom: use provided 'struct bloom_filter_settings'
- bloom: split 'get_bloom_filter()' in two
- commit-graph.c: store maximum changed paths
- commit-graph: respect 'commitGraph.readChangedPaths'
- t/helper/test-read-graph.c: prepare repo settings
- commit-graph: pass a 'struct repository *' in more places
- t4216: use an '&&'-chain
- commit-graph: introduce 'get_bloom_filter_settings()'
(merged to 'next' on 2020-09-22 at 520d531ad8)
+ commit-graph: introduce 'commitGraph.maxNewFilters'
+ builtin/commit-graph.c: introduce '--max-new-filters=<n>'
+ commit-graph: rename 'split_commit_graph_opts'
+ bloom: encode out-of-bounds filters as non-empty
+ bloom/diff: properly short-circuit on max_changes
+ bloom: use provided 'struct bloom_filter_settings'
+ bloom: split 'get_bloom_filter()' in two
+ commit-graph.c: store maximum changed paths
+ commit-graph: respect 'commitGraph.readChangedPaths'
+ t/helper/test-read-graph.c: prepare repo settings
+ commit-graph: pass a 'struct repository *' in more places
+ t4216: use an '&&'-chain
+ commit-graph: introduce 'get_bloom_filter_settings()'
"git commit-graph write" learned to limit the number of bloom
filters that are computed from scratch with the --max-new-filters
option.
Will merge to 'next'.
Will merge to 'master'.
* es/config-hooks (2020-09-09) 9 commits
......@@ -522,17 +439,6 @@ repositories listed at
The "hooks defined in config" topic.
* ls/mergetool-meld-auto-merge (2020-09-16) 1 commit
(merged to 'next' on 2020-09-16 at 01985a671b)
+ mergetool: allow auto-merge for meld to follow the vim-diff behavior
The 'meld' backend of the "git mergetool" learned to give the
underlying 'meld' the '--auto-merge' option, which would help
reduce the amount of text that requires manual merging.
Will merge to 'master'.
* mt/grep-sparse-checkout (2020-09-10) 9 commits
- config: add setting to ignore sparsity patterns in some cmds
- grep: honor sparse checkout patterns
......@@ -578,9 +484,9 @@ repositories listed at
cf. <nycvar.QRO.7.76.6.2009031403510.56@tvgsbejvaqbjf.bet>
* js/no-builtins-on-disk-option (2020-08-24) 3 commits
* js/no-builtins-on-disk-option (2020-09-21) 3 commits
- ci: stop linking built-ins to the dashed versions
- install: optionally skip linking/copying the built-ins
- Optionally skip linking/copying the built-ins
- msvc: copy the correct `.pdb` files in the Makefile target `install`
The installation procedure learned to optionally omit "git-foo"
......@@ -594,26 +500,7 @@ repositories listed at
worth to keep this topic separate from such a policy change to help
it graduate early.
Expecting a reroll to update log message for the last one.
as it confused at least two reviewers.
cf. <xmqqwo1baop3.fsf@gitster.c.googlers.com>
cf. <20200903104537.GA27325@szeder.dev>
* jt/threaded-index-pack (2020-09-08) 7 commits
(merged to 'next' on 2020-09-16 at 8542385cc0)
+ index-pack: make quantum of work smaller
+ index-pack: make resolve_delta() assume base data
+ index-pack: calculate {ref,ofs}_{first,last} early
+ index-pack: remove redundant child field
+ index-pack: unify threaded and unthreaded code
+ index-pack: remove redundant parameter
+ Documentation: deltaBaseCacheLimit is per-thread
"git index-pack" learned to resolve deltified objects with greater
parallelism.
Will merge to 'master'.
Will merge to 'next'.
* jk/refspecs-negative (2020-09-18) 2 commits
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或