To: git@vger.kernel.org
Bcc: lwn@lwn.net
-Subject: What's cooking in git.git (Oct 2020, #04; Tue, 27)
-X-master-at: f9b6481aedae587b1380736fb8f21785119aeb48
-X-next-at: 6691a3f2fe6b2727a10cb93899847c6d6cd6ab69
+Subject: What's cooking in git.git (Oct 2020, #05; Thu, 29)
+X-master-at: ad27df6a5cff694add500ab8c7f97234feb4a91f
+X-next-at: ac1ea6bc6f5e42993b67661c5b0e2e7396ac2607
-What's cooking in git.git (Oct 2020, #04; Tue, 27)
+What's cooking in git.git (Oct 2020, #05; Thu, 29)
--------------------------------------------------
Here are the topics that have been cooking. Commits prefixed with '-' are
with '+' are in 'next'. The ones marked with '.' do not appear in any of
the integration branches, but I am still holding onto them.
-The first batch of topics in this cycle are merged to 'master', and
-the tip of 'next' has been rewound and rebuilt. A handful of new
-topics are also in 'next'.
+Git 2.29.2 has been tagged. About 30+ topics are in 'next' waiting
+their turns to graduate to 'master', while a handful more of topics
+in 'seen' are marked to graduate to 'next'.
Copies of the source code to Git live in many repositories, and the
following is a list of the ones I push into. Some repositories have
https://www.kernel.org/pub/software/scm/git/
--------------------------------------------------
-[Graduated to 'master']
-
-* cc/doc-filter-branch-typofix (2020-10-20) 1 commit
- (merged to 'next' on 2020-10-23 at fc3c91dbc4)
- + filter-branch doc: fix filter-repo typo
-
- Docfix.
-
-
-* cw/ci-ghwf-check-ws-errors (2020-10-09) 1 commit
- (merged to 'next' on 2020-10-26 at e7f8479a06)
- + ci: github action - add check for whitespace errors
-
- Originally merged to 'next' on 2020-10-15
-
- Dev support.
-
-
-* dl/checkout-guess (2020-10-08) 2 commits
- (merged to 'next' on 2020-10-26 at ba63e6e268)
- + checkout: learn to respect checkout.guess
- + Documentation/config/checkout: replace sq with backticks
-
- Originally merged to 'next' on 2020-10-08
-
- "git checkout" learned to use checkout.guess configuration variable
- and enable/disable its "--[no-]guess" option accordingly.
-
-
-* dl/checkout-p-merge-base (2020-10-07) 4 commits
- (merged to 'next' on 2020-10-26 at 1c401bcb0b)
- + t2016: add a NEEDSWORK about the PERL prerequisite
- + add-patch: add NEEDSWORK about comparing commits
- + Doc: document "A...B" form for <tree-ish> in checkout and switch
- + builtin/checkout: fix `git checkout -p HEAD...` bug
-
- Originally merged to 'next' on 2020-10-08
-
- "git checkout -p A...B [-- <path>]" did not work, even though the
- same command without "-p" correctly used the merge-base between
- commits A and B.
-
+[New Topics]
-* ds/maintenance-part-2 (2020-09-25) 8 commits
- (merged to 'next' on 2020-10-26 at 226ac6646d)
- + maintenance: add incremental-repack auto condition
- + maintenance: auto-size incremental-repack batch
- + maintenance: add incremental-repack task
- + midx: use start_delayed_progress()
- + midx: enable core.multiPackIndex by default
- + maintenance: create auto condition for loose-objects
- + maintenance: add loose-objects task
- + maintenance: add prefetch task
- (this branch is used by ds/maintenance-part-3.)
+* jk/sideband-more-error-checking (2020-10-29) 1 commit
+ - sideband: diagnose more sideband anomalies
+ (this branch uses js/avoid-split-sideband-message.)
- Originally merged to 'next' on 2020-10-04
+ The code to detect premature EOF in the sideband demultiplexer has
+ been cleaned up.
- "git maintenance", an extended big brother of "git gc", continues
- to evolve.
+ Will merge to 'next'.
-* jk/committer-date-is-author-date-fix (2020-10-23) 3 commits
- (merged to 'next' on 2020-10-23 at ee490e95b8)
- + rebase: fix broken email with --committer-date-is-author-date
- + am: fix broken email with --committer-date-is-author-date
- + t3436: check --committer-date-is-author-date result more carefully
- (this branch is used by jk/committer-date-is-author-date-fix-simplify.)
+* js/default-branch-name-adjust-t5411 (2020-10-28) 4 commits
+ - t5411: finish preparing for `main` being the default branch name
+ - t5411: adjust the remaining support files for init.defaultBranch=main
+ - t5411: start adjusting the support files for init.defaultBranch=main
+ - t5411: start using the default branch name "main"
+ (this branch uses js/default-branch-name-part-4-minus-1.)
- In 2.29, "--committer-date-is-author-date" option of "rebase" and
- "am" subcommands lost the e-mail address by mistake, which has been
- corrected.
+ Prepare a test script to transition of the default branch name to
+ 'main'.
+ Other than a minor nit, overall it looked sensible.
+ cf. <xmqq5z6u9kkv.fsf@gitster.c.googlers.com>
-* js/no-builtins-on-disk-option (2020-10-21) 1 commit
- (merged to 'next' on 2020-10-22 at 88cec4a607)
- + SKIP_DASHED_BUILT_INS: do not skip the bin/ programs
+--------------------------------------------------
+[Stalled]
- Brown-paper-bag fix.
+* hn/reftable (2020-10-01) 13 commits
+ . reftable: "test-tool dump-reftable" command.
+ . reftable: rest of library
+ . reftable: file level tests
+ . reftable: read reftable files
+ . reftable: write reftable files
+ . reftable: a generic binary tree implementation
+ . reftable: reading/writing blocks
+ . reftable: (de)serialization for the polymorphic record type.
+ . reftable: utility functions
+ . reftable: add a barebones unittest framework
+ . vcxproj: adjust for the reftable changes
+ . reftable: define the public API
+ . reftable: add LICENSE
+ The reftable backend for the refs API.
-* js/userdiff-php (2020-10-07) 1 commit
- (merged to 'next' on 2020-10-26 at 21dc182f78)
- + userdiff: PHP: catch "abstract" and "final" functions
+ Expecting a reroll.
+ Seems not to build for Windows folks.
+ cf. <nycvar.QRO.7.76.6.2010021555290.50@tvgsbejvaqbjf.bet>
+ cf. <nycvar.QRO.7.76.6.2010021557570.50@tvgsbejvaqbjf.bet>
- Originally merged to 'next' on 2020-10-08
- Userdiff for PHP update.
+* sm/curl-retry (2020-10-13) 3 commits
+ - http: automatically retry some requests
+ - replace CURLOPT_FILE With CURLOPT_WRITEDATA
+ - remote-curl: add testing for intelligent retry for HTTP
+ The http transport has been taught to retry a failed request that
+ may reasonably be retried.
-* kb/userdiff-rust-macro-rules (2020-10-07) 1 commit
- (merged to 'next' on 2020-10-26 at 681f75320c)
- + userdiff: recognize 'macro_rules!' as starting a Rust function block
+ cf. <20201015000410.GB328643@google.com>
- Originally merged to 'next' on 2020-10-08
- Userdiff for Rust update.
+* sv/t7001-modernize (2020-09-25) 11 commits
+ - t7001: move cleanup code from outside the tests into them
+ - t7001: use `test` rather than `[`
+ - t7001: use here-docs instead of echo
+ - t7001: put each command on a separate line
+ - t7001: use ': >' rather than 'touch'
+ - t7001: change (cd <path> && git foo) to (git -C <path> foo)
+ - t7001: remove whitespace after redirect operators
+ - t7001: change the style for cd according to subshell
+ - t7001: remove unnecessary blank lines
+ - t7001: use TAB instead of spaces
+ - t7001: convert tests from the old style to the current style
+ Test script modernization.
-* rk/completion-stash (2020-10-07) 2 commits
- (merged to 'next' on 2020-10-26 at d694e89155)
- + git-completion.bash: stash-show: complete $__git_diff_common_options
- + git-completion.bash: __git_diff_common_options: add --[no-]patch
+ Expecting a reroll.
+ cf. <20200925170256.11490-1-shubhunic@gmail.com>
- Originally merged to 'next' on 2020-10-08
- The command line completion script (in contrib/) learned that "git
- stash show" takes the options "git diff" takes.
+* ew/decline-core-abbrev (2020-09-01) 1 commit
+ - core.abbrev <off|false|no> disables abbreviations
+ Allow the configuration to specify no abbreviation regardless of
+ the hash algorithm.
-* rs/dist-doc-with-git-archive (2020-10-12) 2 commits
- (merged to 'next' on 2020-10-26 at 1391e1ae82)
- + Makefile: remove the unused variable TAR_DIST_EXTRA_OPTS
- + Makefile: use git init/add/commit/archive for dist-doc
+ Expecting a reroll. The intent is very good.
- Originally merged to 'next' on 2020-10-15
- Use "git archive" more to produce the release tarball.
+* bc/rev-parse-path-format (2020-10-09) 2 commits
+ - rev-parse: add option for absolute or relative path formatting
+ - abspath: add a function to resolve paths with missing components
+ "git rev-parse" can be explicitly told to give output as absolute
+ or relative path.
-* rs/tighten-callers-of-deref-tag (2020-10-12) 3 commits
- (merged to 'next' on 2020-10-26 at b33d5986e5)
- + line-log: handle deref_tag() returning NULL
- + blame: handle deref_tag() returning NULL
- + grep: handle deref_tag() returning NULL
- Originally merged to 'next' on 2020-10-15
+* ar/fetch-transfer-ipversion (2020-09-16) 1 commit
+ - config: option transfer.ipversion to set transport protocol version for network fetches
- Code clean-up.
+ Adds transfer.ipversion configuration variable.
+ Needs more work.
-* rs/worktree-list-show-locked (2020-10-12) 1 commit
- (merged to 'next' on 2020-10-26 at 398e14f216)
- + worktree: teach `list` to annotate locked worktree
- Originally merged to 'next' on 2020-10-15
+* vv/send-email-with-less-secure-apps-access (2020-08-29) 1 commit
+ - Documentation/git-send-email.txt: Mention less secure app access might need to enable.
- "git worktree list" now shows if each worktree is locked. This
- possibly may open us to show other kinds of states in the future.
+ Doc update.
+ Expecting a reroll.
+ cf. <xmqqwo1hi9nv.fsf@gitster.c.googlers.com>
+ cf. <xmqqft85i72s.fsf@gitster.c.googlers.com>
-* sb/clone-origin (2020-09-30) 7 commits
- (merged to 'next' on 2020-10-26 at 83fbb58da1)
- + clone: allow configurable default for `-o`/`--origin`
- + clone: read new remote name from remote_name instead of option_origin
- + clone: validate --origin option before use
- + refs: consolidate remote name validation
- + remote: add tests for add and rename with invalid names
- + clone: use more conventional config/option layering
- + clone: add tests for --template and some disallowed option pairs
- Originally merged to 'next' on 2020-10-06
+* jc/war-on-dashed-git (2020-08-27) 1 commit
+ - git: catch an attempt to run "git-foo"
- "git clone" learned clone.defaultremotename configuration variable
- to customize what nickname to use to call the remote the repository
- was cloned from.
+ The first step to remove on-disk binaries for built-in subcommands
+ by soliciting objections.
+ On hold for now.
-* sd/userdiff-css-update (2020-10-08) 1 commit
- (merged to 'next' on 2020-10-26 at 253e1d021b)
- + userdiff: expand detected chunk headers for css
- Originally merged to 'next' on 2020-10-08
+* dr/push-remoteref-fix (2020-04-23) 1 commit
+ - remote.c: fix handling of %(push:remoteref)
- Userdiff for CSS update.
+ The "%(push:remoteref)" placeholder in the "--format=" argument of
+ "git format-patch" (and friends) only showed what got explicitly
+ configured, not what ref at the receiving end would be updated when
+ "git push" was used, as it ignored the default behaviour (e.g. update
+ the same ref as the source).
+ Discard for now.
+ cf. <xmqqv9gu7c61.fsf@gitster.c.googlers.com>
+ cf. <20200911214358.acl3hy2e763begoo@feanor>
-* sk/force-if-includes (2020-10-03) 4 commits
- (merged to 'next' on 2020-10-26 at 648422f517)
- + 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"
- + Merge branch 'ds/in-merge-bases-many-optim-bug' into sk/force-if-includes
- Originally merged to 'next' on 2020-10-04
+* mk/use-size-t-in-zlib (2018-10-15) 1 commit
+ - zlib.c: use size_t for size
- "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.
+ The wrapper to call into zlib followed our long tradition to use
+ "unsigned long" for sizes of regions in memory, which have been
+ updated to use "size_t".
--------------------------------------------------
-[New Topics]
+[Cooking]
* cm/t7xxx-cleanup (2020-10-22) 6 commits
(merged to 'next' on 2020-10-26 at 8b58e54942)
(merged to 'next' on 2020-10-26 at 1b550f3245)
+ sideband: report unhandled incomplete sideband messages as bugs
+ sideband: avoid reporting incomplete sideband messages
+ (this branch is used by jk/sideband-more-error-checking.)
The side-band status report can be sent at the same time as the
primary payload multiplexed, but the demultiplexer on the receiving
Code clean-up.
- Unneeded?
+ Unneeded? Perhaps will drop.
cf. <20201022183822.GA781760@nand.local>
the reader side a bit (which we may want to tighten again in a year
or so).
- Is this a real issue, or just a theoretical one?
+ Is this a real issue, or just a theoretical one? Perhaps drop?
cf. <xmqqd01b429a.fsf@gitster.c.googlers.com>
* jk/perl-warning (2020-10-21) 1 commit
- - perl: check for perl warnings while running tests
+ (merged to 'next' on 2020-10-28 at 5fcb98f2ff)
+ + perl: check for perl warnings while running tests
Dev support.
- Will merge to 'next'.
+ Will merge to 'master'.
cf. <20201022032400.GC1480820@coredump.intra.peff.net>
+ tests: start moving to a different default main branch name
+ t9801: use `--` in preparation for default branch rename
+ fmt-merge-msg: also suppress "into main" by default
+ (this branch is used by js/default-branch-name-adjust-t5411.)
Adjust tests so that they won't scream when the default initial
branch name is changed to 'main'.
Will merge to 'master'.
-* pb/ref-filter-with-crlf (2020-10-22) 2 commits
+* pb/ref-filter-with-crlf (2020-10-29) 2 commits
- log, show: add tests for messages containing CRLF
- ref-filter: handle CRLF at end-of-line more gracefully
Exit codes from "git remote add" etc. were not usable by scripted
callers.
+ Will merge to 'next'.
+
-* en/merge-ort-api-null-impl (2020-10-26) 4 commits
+* en/merge-ort-api-null-impl (2020-10-29) 4 commits
- merge,rebase,revert: select ort or recursive by config or environment
- - fast-rebase: demonstrate merge-ort's API via temporary/hidden command
+ - fast-rebase: demonstrate merge-ort's API via new test-tool command
- merge-ort-wrappers: new convience wrappers to mimic the old merge API
- merge-ort: barebones API of new merge strategy with empty implementation
Preparation for a new merge strategy.
+ Looking good.
+
* en/merge-tests (2020-10-26) 9 commits
- t6423: add more details about direct resolution of directories
Code symplification.
+ Will merge to 'next'.
+
* sj/untracked-files-in-submodule-directory-is-not-dirty (2020-10-26) 1 commit
- diff: do not show submodule with untracked files as "-dirty"
Needs doc update.
-* fc/zsh-completion (2020-10-26) 29 commits
+* fc/zsh-completion (2020-10-28) 29 commits
- zsh: update copyright notices
- completion: bash: remove old compat wrappers
- completion: bash: cleanup cygwin check
- completion: zsh: fix name due to broken autoloading
- completion: zsh: fix __gitcomp_direct()
+ Zsh autocompletion (in contrib/) update.
+
+ Will merge to 'next'.
+
* jc/doc-final-resend (2020-10-26) 1 commit
- SubmittingPatches: clarify the purpose of the final resend
+ Update developer doc.
+
+ Will merge to 'next'.
+
* nk/perf-fsmonitor (2020-10-26) 10 commits
- t/perf/fsmonitor: add benchmark for dirty status
- t/perf/fsmonitor: separate one time repo initialization
(this branch uses nk/diff-files-vs-fsmonitor.)
+ Add t/perf support for fsmonitor.
+
* jk/checkout-index-errors (2020-10-27) 2 commits
- checkout-index: propagate errors to exit code
- checkout-index: drop error message from empty --stage=all
+ (this branch is used by mt/parallel-checkout-part-1.)
+
+ "git checkout-index" did not consistently signal an error with its
+ exit status.
+
+ Will merge to 'next'.
* pw/rebase-i-orig-head (2020-10-27) 4 commits
- rebase -i: use struct object_id rather than looking up commit
- rebase -i: stop overwriting ORIG_HEAD buffer
---------------------------------------------------
-[Stalled]
-
-* hn/reftable (2020-10-01) 13 commits
- . reftable: "test-tool dump-reftable" command.
- . reftable: rest of library
- . reftable: file level tests
- . reftable: read reftable files
- . reftable: write reftable files
- . reftable: a generic binary tree implementation
- . reftable: reading/writing blocks
- . reftable: (de)serialization for the polymorphic record type.
- . reftable: utility functions
- . reftable: add a barebones unittest framework
- . vcxproj: adjust for the reftable changes
- . reftable: define the public API
- . reftable: add LICENSE
-
- The reftable backend for the refs API.
-
- Expecting a reroll.
- Seems not to build for Windows folks.
- cf. <nycvar.QRO.7.76.6.2010021555290.50@tvgsbejvaqbjf.bet>
- cf. <nycvar.QRO.7.76.6.2010021557570.50@tvgsbejvaqbjf.bet>
-
-
-* sm/curl-retry (2020-10-13) 3 commits
- - http: automatically retry some requests
- - replace CURLOPT_FILE With CURLOPT_WRITEDATA
- - remote-curl: add testing for intelligent retry for HTTP
-
- The http transport has been taught to retry a failed request that
- may reasonably be retried.
-
- cf. <20201015000410.GB328643@google.com>
-
-
-* sv/t7001-modernize (2020-09-25) 11 commits
- - t7001: move cleanup code from outside the tests into them
- - t7001: use `test` rather than `[`
- - t7001: use here-docs instead of echo
- - t7001: put each command on a separate line
- - t7001: use ': >' rather than 'touch'
- - t7001: change (cd <path> && git foo) to (git -C <path> foo)
- - t7001: remove whitespace after redirect operators
- - t7001: change the style for cd according to subshell
- - t7001: remove unnecessary blank lines
- - t7001: use TAB instead of spaces
- - t7001: convert tests from the old style to the current style
-
- Test script modernization.
-
- Expecting a reroll.
- cf. <20200925170256.11490-1-shubhunic@gmail.com>
-
-
-* ew/decline-core-abbrev (2020-09-01) 1 commit
- - core.abbrev <off|false|no> disables abbreviations
-
- Allow the configuration to specify no abbreviation regardless of
- the hash algorithm.
-
- Expecting a reroll. The intent is very good.
-
-
-* bc/rev-parse-path-format (2020-10-09) 2 commits
- - rev-parse: add option for absolute or relative path formatting
- - abspath: add a function to resolve paths with missing components
+ "git rebase -i" did not
- "git rev-parse" can be explicitly told to give output as absolute
- or relative path.
+ Expecting an update to the log message, but otherwise the change
+ looked sensible.
+ cf. <xmqq7drbbcj5.fsf@gitster.c.googlers.com>
-* ar/fetch-transfer-ipversion (2020-09-16) 1 commit
- - config: option transfer.ipversion to set transport protocol version for network fetches
-
- Adds transfer.ipversion configuration variable.
-
- Needs more work.
-
-
-* vv/send-email-with-less-secure-apps-access (2020-08-29) 1 commit
- - Documentation/git-send-email.txt: Mention less secure app access might need to enable.
-
- Doc update.
-
- Expecting a reroll.
- cf. <xmqqwo1hi9nv.fsf@gitster.c.googlers.com>
- cf. <xmqqft85i72s.fsf@gitster.c.googlers.com>
-
-
-* jc/war-on-dashed-git (2020-08-27) 1 commit
- - git: catch an attempt to run "git-foo"
-
- The first step to remove on-disk binaries for built-in subcommands
- by soliciting objections.
-
- On hold for now.
-
-
-* dr/push-remoteref-fix (2020-04-23) 1 commit
- - remote.c: fix handling of %(push:remoteref)
-
- The "%(push:remoteref)" placeholder in the "--format=" argument of
- "git format-patch" (and friends) only showed what got explicitly
- configured, not what ref at the receiving end would be updated when
- "git push" was used, as it ignored the default behaviour (e.g. update
- the same ref as the source).
-
- Discard for now.
- cf. <xmqqv9gu7c61.fsf@gitster.c.googlers.com>
- cf. <20200911214358.acl3hy2e763begoo@feanor>
-
-
-* mk/use-size-t-in-zlib (2018-10-15) 1 commit
- - zlib.c: use size_t for size
-
- The wrapper to call into zlib followed our long tradition to use
- "unsigned long" for sizes of regions in memory, which have been
- updated to use "size_t".
-
---------------------------------------------------
-[Cooking]
-
* en/strmap (2020-10-13) 10 commits
- strmap: enable allocations to come from a mem_pool
- strmap: add a strset sub-type
* mr/bisect-in-c-3 (2020-10-16) 7 commits
- - bisect--helper: retire `--bisect-autostart` subcommand
- - bisect--helper: retire `--write-terms` subcommand
- - bisect--helper: retire `--check-expected-revs` subcommand
- - bisect--helper: reimplement `bisect_state` & `bisect_head` shell functions in C
- - bisect--helper: retire `--next-all` subcommand
- - bisect--helper: retire `--bisect-clean-state` subcommand
- - bisect--helper: finish porting `bisect_start()` to C
+ (merged to 'next' on 2020-10-28 at 435792b62f)
+ + bisect--helper: retire `--bisect-autostart` subcommand
+ + bisect--helper: retire `--write-terms` subcommand
+ + bisect--helper: retire `--check-expected-revs` subcommand
+ + bisect--helper: reimplement `bisect_state` & `bisect_head` shell functions in C
+ + bisect--helper: retire `--next-all` subcommand
+ + bisect--helper: retire `--bisect-clean-state` subcommand
+ + bisect--helper: finish porting `bisect_start()` to C
Rewriting "git bisect" in C continues.
- Will merge to 'next'.
+ Will merge to 'master'.
* sc/sequencer-gpg-octopus (2020-10-18) 3 commits
* as/tests-cleanup (2020-10-18) 1 commit
- - t2200,t9832: avoid using 'git' upstream in a pipe
+ (merged to 'next' on 2020-10-28 at fd199beb31)
+ + t2200,t9832: avoid using 'git' upstream in a pipe
Micro clean-up of a couple of test scripts.
- Will merge to 'next'.
+ Will merge to 'master'.
* bk/sob-dco (2020-10-20) 4 commits
* en/dir-rename-tests (2020-10-16) 4 commits
- - t6423: more involved rules for renaming directories into each other
- - t6423: update directory rename detection tests with new rule
- - t6423: more involved directory rename test
- - directory-rename-detection.txt: update references to regression tests
+ (merged to 'next' on 2020-10-28 at 7bbe123e70)
+ + t6423: more involved rules for renaming directories into each other
+ + t6423: update directory rename detection tests with new rule
+ + t6423: more involved directory rename test
+ + directory-rename-detection.txt: update references to regression tests
(this branch is used by en/merge-tests.)
More preliminary tests have been added to document desired outcome
of various "directory rename" situations.
- Will merge to 'next'.
+ Will merge to 'master'.
* en/t7518-unflake (2020-10-18) 1 commit
* es/tutorial-mention-asciidoc-early (2020-10-16) 1 commit
- - MyFirstContribution: clarify asciidoc dependency
+ (merged to 'next' on 2020-10-28 at 96e0d84d94)
+ + MyFirstContribution: clarify asciidoc dependency
Doc update.
- Will merge to 'next'.
+ Will merge to 'master'.
* jk/fast-import-marks-alloc-fix (2020-10-15) 1 commit
* nk/diff-files-vs-fsmonitor (2020-10-20) 7 commits
- - p7519-fsmonitor: add a git add benchmark
- - p7519-fsmonitor: refactor to avoid code duplication
- - perf lint: add make test-lint to perf tests
- - t/perf: add fsmonitor perf test for git diff
- - t/perf/p7519-fsmonitor.sh: warm cache on first git status
- - t/perf/README: elaborate on output format
- - fsmonitor: use fsmonitor data in `git diff`
+ (merged to 'next' on 2020-10-28 at d3af804056)
+ + p7519-fsmonitor: add a git add benchmark
+ + p7519-fsmonitor: refactor to avoid code duplication
+ + perf lint: add make test-lint to perf tests
+ + t/perf: add fsmonitor perf test for git diff
+ + t/perf/p7519-fsmonitor.sh: warm cache on first git status
+ + t/perf/README: elaborate on output format
+ + fsmonitor: use fsmonitor data in `git diff`
(this branch is used by nk/perf-fsmonitor.)
"git diff" and other commands that share the same machinery to
compare with working tree files have been taught to take advantage
of the fsmonitor data when available.
- Will merge to 'next'.
+ Will merge to 'master'.
* nk/dir-c-comment-update (2020-10-16) 1 commit
learned to ensure that in-tree files like `.gitignore` and
`.gitattributes` are not symbolic links.
- Will merge to 'master'.
+ It seems that there are real projects with .gitignore recorded as
+ symlinks, which may need to loosen the fsck setting. Do we need
+ to introduce a class that is separate from symlinked .gitmodules
+ that probably is with potential consequences that is more grave?
* dl/resurrect-update-for-sha256 (2020-10-08) 2 commits
Will merge to 'master'.
-* mt/parallel-checkout-part-1 (2020-10-22) 20 commits
- - parallel-checkout: drop unused checkout state parameter
+* mt/parallel-checkout-part-1 (2020-10-29) 19 commits
- ci: run test round with parallel-checkout enabled
- parallel-checkout: add tests related to .gitattributes
- parallel-checkout: add tests related to clone collisions
- convert: add get_stream_filter_ca() variant
- convert: add [async_]convert_to_working_tree_ca() variants
- convert: make convert_attrs() and convert structs public
+ (this branch uses jk/checkout-index-errors.)
Parallel checkout.
- Ejected from 'next'
- cf. <CAHd-oW568aNLYYMBDPJiUsWzh2xxtm8gnqLEiX_RTDa81BL_yw@mail.gmail.com>
-
* dl/diff-merge-base (2020-09-21) 10 commits
(merged to 'next' on 2020-10-26 at 114d94030b)
projects / thirdparty / git.git / commitdiff
