* What's cooking in git.git (Mar 2022, #05; Wed, 23)
@ 2022-03-24 3:13 Junio C Hamano
2022-03-25 13:38 ` ab/commit-plug-leaks (was: What's cooking in git.git (Mar 2022, #05; Wed, 23)) Ævar Arnfjörð Bjarmason
2022-03-26 16:05 ` fr/vimdiff-layout " Ævar Arnfjörð Bjarmason
0 siblings, 2 replies; 6+ messages in thread
From: Junio C Hamano @ 2022-03-24 3:13 UTC (permalink / raw)
To: git
Here are the topics that have been cooking in my tree. Commits
prefixed with '+' are in 'next' (being in 'next' is a sign that a
topic is stable enough to be used and are candidate to be in a
future release). Commits prefixed with '-' are only in 'seen',
which means nothing more than that I have found them of interest for
some reason (like "it may have hard-to-resolve conflicts with
another topic already in flight" or "this may turn out to be
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.
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
repositories have only a subset of branches.
With maint, master, next, seen, todo:
git://git.kernel.org/pub/scm/git/git.git/
git://repo.or.cz/alt-git.git/
https://kernel.googlesource.com/pub/scm/git/git/
https://github.com/git/git/
https://gitlab.com/git-vcs/git/
With all the integration branches and topics broken out:
https://github.com/gitster/git/
Even though the preformatted documentation in HTML and man format
are not sources, they are published in these repositories for
convenience (replace "htmldocs" with "manpages" for the manual
pages):
git://git.kernel.org/pub/scm/git/git-htmldocs.git/
https://github.com/gitster/git-htmldocs.git/
Release tarballs are available at:
https://www.kernel.org/pub/software/scm/git/
--------------------------------------------------
[Graduated to 'master']
* ab/plug-random-leaks (2022-03-17) 2 commits
(merged to 'next' on 2022-03-17 at 381101b075)
+ diff.c: fix a double-free regression in a18d66cefb
+ tests: demonstrate "show --word-diff --color-moved" regression
Double-free fix for a recently merged topic.
source: <cover-v2-0.2-00000000000-20220317T144838Z-avarab@gmail.com>
* ab/reflog-prep-fix (2022-03-13) 1 commit
(merged to 'next' on 2022-03-15 at c9ef333999)
+ reflog: don't be noisy on empty reflogs
Regression fix.
source: <de5e2b0e290791d0a4f58a893d8571b5fc8c4f1a.1646952843.git.avarab@gmail.com>
* ac/test-lazy-fetch (2022-03-16) 1 commit
(merged to 'next' on 2022-03-17 at 11eb486b7f)
+ partial-clone: add a partial-clone test case
A new test to ensure a lazy fetching is not triggered when it
should not be.
source: <pull.1175.v2.git.1647423969576.gitgitgadget@gmail.com>
* bc/block-sha1-without-gcc-asm-extension (2022-03-10) 1 commit
(merged to 'next' on 2022-03-15 at e285d9988f)
+ block-sha1: remove use of obsolete x86 assembly
Get rid of one use of __asm__() GCC extension that does not help us
much these days, which has an added advantage of not having to
worry about -pedantic complaining.
source: <20220310174750.4166514-1-sandals@crustytoothpaste.net>
* dc/complete-restore (2022-03-15) 1 commit
(merged to 'next' on 2022-03-17 at 34a4fd8796)
+ completion: tab completion of filenames for 'git restore'
The command line completion support (in contrib/) learns to give
modified paths to the "git restore" command.
source: <pull.1227.v3.git.git.1647382437475.gitgitgadget@gmail.com>
* ds/doc-maintenance-synopsis-fix (2022-03-15) 1 commit
(merged to 'next' on 2022-03-17 at eb26e034a3)
+ maintenance: fix synopsis in documentation
Doc update.
source: <pull.1178.git.1647366104967.gitgitgadget@gmail.com>
* ds/partial-bundles (2022-03-09) 13 commits
(merged to 'next' on 2022-03-13 at 03529eaa59)
+ clone: fail gracefully when cloning filtered bundle
+ bundle: unbundle promisor packs
+ bundle: create filtered bundles
+ rev-list: move --filter parsing into revision.c
+ bundle: parse filter capability
+ list-objects: handle NULL function pointers
+ MyFirstObjectWalk: update recommended usage
+ list-objects: consolidate traverse_commit_list[_filtered]
+ pack-bitmap: drop filter in prepare_bitmap_walk()
+ pack-objects: use rev.filter when possible
+ revision: put object filter into struct rev_info
+ list-objects-filter-options: create copy helper
+ index-pack: document and test the --promisor option
(this branch is used by ds/bundle-uri.)
Bundle file format gets extended to allow a partial bundle,
filtered by similar criteria you would give when making a
partial/lazy clone.
source: <pull.1159.v4.git.1646841703.gitgitgadget@gmail.com>
* ep/remove-duplicated-includes (2022-03-14) 6 commits
(merged to 'next' on 2022-03-15 at 0f87385b56)
+ attr.h: remove duplicate struct definition
+ t/helper/test-run-command.c: delete duplicate include
+ builtin/stash.c: delete duplicate include
+ builtin/sparse-checkout.c: delete duplicate include
+ builtin/gc.c: delete duplicate include
+ attr.c: delete duplicate include
Code clean-up.
source: <20220313195536.224075-1-gitter.spiros@gmail.com>
* ep/t6423-modernize (2022-03-13) 1 commit
(merged to 'next' on 2022-03-15 at d37f7359bf)
+ t6423-merge-rename-directories.sh: use the $(...) construct
Code clean-up.
source: <20220313172829.215517-1-gitter.spiros@gmail.com>
* ep/test-malloc-check-with-glibc-2.34 (2022-03-09) 2 commits
(merged to 'next' on 2022-03-12 at 13ed9014e6)
+ test-lib: declare local variables as local
(merged to 'next' on 2022-03-08 at 810ac5a1d3)
+ test-lib.sh: Use GLIBC_TUNABLES instead of MALLOC_CHECK_ on glibc >= 2.34
The method to trigger malloc check used in our tests no longer work
with newer versions of glibc.
source: <81f43fbefde84ab7af9ee2ac760845b728a48ab5.1646861976.git.git@grubix.eu>
* gc/submodule-update-part1 (2022-03-04) 13 commits
(merged to 'next' on 2022-03-15 at 92911dced9)
+ submodule--helper update-clone: check for --filter and --init
+ submodule update: add tests for --filter
+ submodule--helper: remove ensure-core-worktree
+ submodule--helper update-clone: learn --init
+ submodule--helper: allow setting superprefix for init_submodule()
+ submodule--helper: refactor get_submodule_displaypath()
+ submodule--helper run-update-procedure: learn --remote
+ submodule--helper: don't use bitfield indirection for parse_options()
+ submodule--helper: get remote names from any repository
+ submodule--helper run-update-procedure: remove --suboid
+ submodule--helper: reorganize code for sh to C conversion
+ submodule--helper: remove update-module-mode
+ submodule tests: test for init and update failure output
(this branch is used by gc/submodule-update-part2.)
Rewrite of "git submodule update" in C (early part).
source: <20220305001401.20888-1-chooglen@google.com>
* jc/cat-file-batch-default-format-optim (2022-03-15) 1 commit
(merged to 'next' on 2022-03-17 at 2d7f0efefa)
+ cat-file: skip expanding default format
Optimize away strbuf_expand() call with a hardcoded formatting logic
specific for the default format in the --batch and --batch-check
options of "git cat-file".
source: <pull.1221.v4.git.git.1647312036664.gitgitgadget@gmail.com>
* jd/userdiff-kotlin (2022-03-12) 1 commit
(merged to 'next' on 2022-03-15 at 10fabd722a)
+ userdiff: add builtin diff driver for kotlin language.
A new built-in userdiff driver for kotlin.
source: <20220312044832.718356-1-jaydeepjd.8914@gmail.com>
* jk/name-rev-w-genno (2022-03-13) 1 commit
(merged to 'next' on 2022-03-15 at b370601916)
+ name-rev: use generation numbers if available
"git name-rev" learned to use the generation numbers when setting
the lower bound of searching commits used to explain the revision,
when available, instead of committer time.
source: <20220312000015.3643427-1-jacob.e.keller@intel.com>
* js/in-place-reverse-in-sequencer (2022-03-16) 1 commit
(merged to 'next' on 2022-03-17 at e69c91c5f5)
+ sequencer: use reverse_commit_list() helper
Code clean-up.
source: <pull.1177.v3.git.1647429623830.gitgitgadget@gmail.com>
* jy/gitweb-no-need-for-meta (2022-03-08) 2 commits
(merged to 'next' on 2022-03-13 at 1e8d643130)
+ gitweb: remove invalid http-equiv="content-type"
+ comment: fix typo
Remove unneeded <meta http-equiv=content-type...> from gitweb
output.
source: <20220308155612.105957-3-jason@jasonyundt.email>
* ps/repack-with-server-info (2022-03-14) 2 commits
(merged to 'next' on 2022-03-17 at aafa287b91)
+ repack: add config to skip updating server info
+ repack: refactor to avoid double-negation of update-server-info
"git repack" learned a new configuration to disable triggering of
age-old "update-server-info" command, which is rarely useful these
days.
source: <cover.1647243508.git.ps@pks.im>
* pw/single-key-interactive (2022-02-23) 4 commits
(merged to 'next' on 2022-03-13 at 02fd6aca2f)
+ add -p: disable stdin buffering when interactive.singlekey is set
+ terminal: set VMIN and VTIME in non-canonical mode
+ terminal: pop signal handler when terminal is restored
+ terminal: always reset terminal when reading without echo
(this branch is used by pw/add-p-single-key.)
The single-key interactive operation used by "git add -p" has been
made more robust.
source: <pull.1146.v2.git.1645556015.gitgitgadget@gmail.com>
* sm/no-git-in-upstream-of-pipe-in-tests (2022-03-12) 3 commits
(merged to 'next' on 2022-03-12 at 9e6f538b36)
+ t0030-t0050: avoid pipes with Git on LHS
+ t0001-t0028: avoid pipes with Git on LHS
(merged to 'next' on 2022-03-08 at 3ff4e5c09c)
+ t0003: avoid pipes with Git on LHS
Test fixes.
source: <20220223115347.3083-1-shivam828787@gmail.com>
--------------------------------------------------
[New Topics]
* ab/refs-various-fixes (2022-03-17) 5 commits
(merged to 'next' on 2022-03-18 at d65ed663a7)
+ refs debug: add a wrapper for "read_symbolic_ref"
+ packed-backend: remove stub BUG(...) functions
+ misc *.c: use designated initializers for struct assignments
+ refs: use designated initializers for "struct ref_iterator_vtable"
+ refs: use designated initializers for "struct ref_storage_be"
Code clean-up.
Will merge to 'master'.
source: <cover-0.5-00000000000-20220317T171618Z-avarab@gmail.com>
* ab/reflog-parse-options (2022-03-23) 8 commits
- reflog [show]: display sensible -h output
- reflog: convert to parse_options() API
- reflog exists: use parse_options() API
- git reflog [expire|delete]: make -h output consistent with SYNOPSIS
- reflog: move "usage" variables and use macros
- reflog tests: add missing "git reflog exists" tests
- reflog: refactor cmd_reflog() to "if" branches
- reflog.c: indent argument lists
"git reflog" command now uses parse-options API to parse its
command line options.
Will merge to 'next'?
source: <cover-0.8-00000000000-20220317T180439Z-avarab@gmail.com>
* jt/reset-grafts-when-resetting-shallow (2022-03-17) 1 commit
(merged to 'next' on 2022-03-21 at 7030392f37)
+ shallow: reset commit grafts when shallow is reset
When "shallow" information is updated, we forgot to update the
in-core equivalent, which has been corrected.
Will merge to 'master'.
source: <20220317182448.1633847-1-jonathantanmy@google.com>
* ab/make-optim-noop (2022-03-21) 1 commit
(merged to 'next' on 2022-03-23 at ea8e0bdc37)
+ Makefile: use ' ', not non-existing $(wspfx_SQ)
A micro fix to a topic earlier merged to 'master'
Will merge to 'master'.
source: <patch-1.1-05949221e3f-20220319T002715Z-avarab@gmail.com>
* kf/p4-multiple-remotes (2022-03-21) 1 commit
- git-p4: fix issue with multiple perforce remotes
source: <pull.1180.git.1647866603032.gitgitgadget@gmail.com>
* ab/racy-hooks (2022-03-23) 1 commit
- hooks: fix "invoked hook" regression in a8cc5943338
Will merge to 'next'.
source: <patch-1.1-d0c9b430b2c-20220321T230933Z-avarab@gmail.com>
* ds/partial-bundle-more (2022-03-23) 5 commits
- bundle: output hash information in 'verify'
- bundle: move capabilities to end of 'verify'
- pack-objects: parse --filter directly into revs.filter
- pack-objects: move revs out of get_object_list()
- list-objects-filter: remove CL_ARG__FILTER
Code clean-up.
Will merge to 'next'?
source: <pull.1186.git.1647970119.gitgitgadget@gmail.com>
* fr/vimdiff-layout (2022-03-23) 3 commits
- vimdiff: integrate layout tests in the unit tests framework ('t' folder)
- vimdiff: add tool documentation
- vimdiff: new implementation with layout support
Reimplement "vimdiff[123]" mergetool drivers with a more generic
layout mechanism.
Will merge to 'next'?
source: <20220319091141.4911-1-greenfoo@u92.eu>
--------------------------------------------------
[Stalled]
* rj/receive-pack-abort-upon-disconnect (2022-01-28) 1 commit
. receive-pack: check if client is alive before completing the push
"git push" may be killed by the user when the server side has
finished receiving all data and is about to commit the result.
Give the latter a better chance to notice such situation and abort
processing the ref updates.
Will discard; getting tired of waiting
cf. <220204.864k5e4yvf.gmgdl@evledraar.gmail.com>
source: <20220128194811.3396281-1-robin.jarry@6wind.com>
* je/http-better-error-output (2021-12-03) 1 commit
. http-backend: give a hint that web browser access is not supported
When the http-backend program, which is the server-side component
for the smart HTTP transport, sends a "404 Not found" error, we
deliberately did not say anything to the requesting client. We now
send a message back to the browser to tell the user that they do
not want to visit the URL via their browser, instead of a totally
blank page.
Will discard; getting tired of waiting
cf. <7r23s082-o3q0-479o-srqn-r45q778s5nq7@vanv.qr>
source: <20211202102855.23907-1-jengelh@inai.de>
* cb/save-term-across-editor-invocation (2021-12-01) 3 commits
. fixup! editor: allow for saving/restoring terminal state
. editor: allow for saving/restoring terminal state
. terminal: teach save_term to fail when not foreground
Some editors are reported to leave the terminal in funny state
after they exit on Windows. Work it around by saving and restoring
the terminal state when needed.
Will discard; getting tired of waiting
cf. <CAPUEsphktbdxeV7hvF52Or3CVHS8oOk5-WV=xfEZa8kfCVVnVg@mail.gmail.com>
source: <20211202035446.1154-1-carenas@gmail.com>
--------------------------------------------------
[Cooking]
* bc/stash-export (2022-03-16) 6 commits
- doc: add stash export and import to docs
- builtin/stash: provide a way to import stashes from a ref
- builtin/stash: provide a way to export stashes to a ref
- object-name: make get_oid quietly return an error
- builtin/stash: fill in all commit data
- builtin/stash: factor out generic function to look up stash info
A mechanism to export and import stash entries to and from a normal
commit to transfer it across repositories has been introduced.
Expecting a reroll.
source: <20220310173236.4165310-1-sandals@crustytoothpaste.net>
* gc/submodule-update-part2 (2022-03-16) 8 commits
- submodule--helper: remove forward declaration
- submodule: move core cmd_update() logic to C
- submodule--helper: reduce logic in run_update_procedure()
- submodule--helper: teach update_data more options
- builtin/submodule--helper.c: rename option struct to "opt"
- submodule update: use die_message()
- submodule--helper: run update using child process struct
- Merge branch 'gc/submodule-update-part1' into gc/submodule-update-part2
Move more "git submodule update" to C.
Will merge to 'next'?
source: <20220315210925.79289-1-chooglen@google.com>
* ns/batch-fsync (2022-03-21) 8 commits
- core.fsyncmethod: performance tests for add and stash
- core.fsyncmethod: tests for batch mode
- core.fsync: use batch mode and sync loose objects by default on Windows
- unpack-objects: use the bulk-checkin infrastructure
- update-index: use the bulk-checkin infrastructure
- core.fsyncmethod: batched disk flushes for loose-objects
- bulk-checkin: rename 'state' variable and separate 'plugged' boolean
- Merge branch 'ns/core-fsyncmethod' into ns/batch-fsync
(this branch uses ns/core-fsyncmethod.)
Introduce a filesystem-dependent mechanism to optimize the way the
bits for many loose object files are ensured to hit the disk
platter.
source: <pull.1134.v2.git.1647760560.gitgitgadget@gmail.com>
* vd/cache-bottom-fix (2022-03-17) 3 commits
(merged to 'next' on 2022-03-21 at 6760b84f38)
+ Revert "unpack-trees: improve performance of next_cache_entry"
+ unpack-trees: increment cache_bottom for sparse directories
+ t1092: add sparse directory before cone in test repo
Correct a bug in unpack-trees introduced earlier.
Will merge to 'master'.
source: <pull.1179.v2.git.1647532536.gitgitgadget@gmail.com>
* ns/core-fsyncmethod (2022-03-15) 6 commits
(merged to 'next' on 2022-03-17 at c8a52f8cbe)
+ core.fsync: documentation and user-friendly aggregate options
+ core.fsync: new option to harden the index
+ core.fsync: add configuration parsing
+ core.fsync: introduce granular fsync control infrastructure
+ core.fsyncmethod: add writeout-only mode
+ wrapper: make inclusion of Windows csprng header tightly scoped
(this branch is used by ns/batch-fsync and ps/fsync-refs.)
Replace core.fsyncObjectFiles with two new configuration variables,
core.fsync and core.fsyncMethod.
Will merge to 'master'.
source: <pull.1093.v6.git.1646952204.gitgitgadget@gmail.com>
* pw/add-p-single-key (2022-03-16) 5 commits
(merged to 'next' on 2022-03-23 at a00396d9a1)
+ terminal: restore settings on SIGTSTP
+ terminal: work around macos poll() bug
+ terminal: don't assume stdin is /dev/tty
+ terminal: use flags for save_term()
+ Merge branch 'pw/single-key-interactive' into pw/add-p-single-key
Finishing touches to C rewrite of "git add -i" in single-key
interactive mode.
Will merge to 'master'.
source: <20220316185405.29551-5-phillip.wood123@gmail.com>
* en/sparse-cone-becomes-default (2022-03-13) 9 commits
- Documentation: some sparsity wording clarifications
- git-sparse-checkout.txt: mark non-cone mode as deprecated
- git-sparse-checkout.txt: flesh out non-cone mode pattern discussion a bit
- git-sparse-checkout.txt: add a new EXAMPLES section
- git-sparse-checkout.txt: shuffle some sections and mark as internal
- git-sparse-checkout.txt: update docs for deprecation of 'init'
- git-sparse-checkout.txt: wording updates for the cone mode default
- sparse-checkout: make --cone the default
- tests: stop assuming --no-cone is the default mode for sparse-checkout
source: <pull.1148.v2.git.1647054681.gitgitgadget@gmail.com>
* jc/rebase-detach-fix (2022-03-18) 2 commits
(merged to 'next' on 2022-03-21 at 1eb51c65c9)
+ rebase: set REF_HEAD_DETACH in checkout_up_to_date()
+ rebase: use test_commit helper in setup
"git rebase $base $non_branch_commit", when $base is an ancestor or
the $non_branch_commit, modified the current branch, which has been
corrected.
Will merge to 'master'.
source: <pull.1226.v5.git.git.1647611643.gitgitgadget@gmail.com>
* ps/fsync-refs (2022-03-15) 2 commits
(merged to 'next' on 2022-03-17 at 9e007c1178)
+ core.fsync: new option to harden references
+ Merge branch 'ns/core-fsyncmethod' into ps/fsync-refs
(this branch uses ns/core-fsyncmethod.)
Updates to refs traditionally weren't fsync'ed, but we can
configure using core.fsync variable to do so.
Will merge to 'master'.
source: <47dd79106b93bb81750320d50ccaa74c24aacd28.1646992380.git.ps@pks.im>
* vd/stash-silence-reset (2022-03-23) 8 commits
(merged to 'next' on 2022-03-23 at 932f4f6529)
+ reset: remove 'reset.refresh' config option
+ reset: remove 'reset.quiet' config option
+ reset: do not make '--quiet' disable index refresh
(merged to 'next' on 2022-03-17 at c469159b61)
+ stash: make internal resets quiet and refresh index
+ reset: suppress '--no-refresh' advice if logging is silenced
+ reset: replace '--quiet' with '--no-refresh' in performance advice
+ reset: introduce --[no-]refresh option to --mixed
+ reset: revise index refresh advice
"git stash" does not allow subcommands it internally runs as its
implementation detail, except for "git reset", to emit messages;
now "git reset" part has also been squelched.
Will merge to 'master'.
source: <pull.1184.v2.git.1648059480.gitgitgadget@gmail.com>
source: <pull.1170.v3.git.1647308982.gitgitgadget@gmail.com>
* tl/ls-tree-oid-only (2022-03-23) 15 commits
- ls-tree: split up "fast path" callbacks
- ls-tree: detect and error on --name-only --name-status
- ls-tree: support --object-only option for "git-ls-tree"
- ls-tree: introduce "--format" option
- cocci: allow padding with `strbuf_addf()`
- ls-tree: introduce struct "show_tree_data"
- ls-tree: slightly refactor `show_tree()`
- ls-tree: fix "--name-only" and "--long" combined use bug
- ls-tree: simplify nesting if/else logic in "show_tree()"
- ls-tree: rename "retval" to "recurse" in "show_tree()"
- ls-tree: use "size_t", not "int" for "struct strbuf"'s "len"
- ls-tree: use "enum object_type", not {blob,tree,commit}_type
- ls-tree: add missing braces to "else" arms
- ls-tree: remove commented-out code
- ls-tree tests: add tests for --name-status
"git ls-tree" learns "--oid-only" option, similar to "--name-only",
and more generalized "--format" option.
Will merge to 'next'?
source: <cover.1648026472.git.dyroneteng@gmail.com>
* ab/hook-tests-updates (2022-03-17) 13 commits
(merged to 'next' on 2022-03-23 at 8c35279100)
+ http tests: use "test_hook" for "smart" and "dumb" http tests
+ proc-receive hook tests: use "test_hook" instead of "write_script"
+ tests: extend "test_hook" for "rm" and "chmod -x", convert "$HOOK"
+ tests: use "test_hook" for misc "mkdir -p" and "chmod" cases
+ tests: change "mkdir -p && write_script" to use "test_hook"
+ tests: change "cat && chmod +x" to use "test_hook"
+ gc + p4 tests: use "test_hook", remove sub-shells
+ fetch+push tests: use "test_hook" and "test_when_finished" pattern
+ bugreport tests: tighten up "git bugreport -s hooks" test
+ tests: assume the hooks are disabled by default
+ http tests: don't rely on "hook/post-update.sample"
+ hook tests: turn exit code assertions into a loop
+ test-lib-functions: add and use a "test_hook" wrapper
Update tests around the use of hook scripts.
Will merge to 'master'.
source: <cover-v3-00.13-00000000000-20220317T100820Z-avarab@gmail.com>
* jc/mailsplit-warn-on-tty (2022-03-03) 1 commit
- am/apply: warn if we end up reading patches from terminal
"git am" can read from the standard input when no mailbox is given
on the command line, but the end-user gets no indication when it
happens, making Git appear stuck.
source: <xmqqlexq8zqo.fsf@gitster.g>
* tb/cruft-packs (2022-03-02) 17 commits
- sha1-file.c: don't freshen cruft packs
- builtin/gc.c: conditionally avoid pruning objects via loose
- builtin/repack.c: add cruft packs to MIDX during geometric repack
- builtin/repack.c: use named flags for existing_packs
- builtin/repack.c: allow configuring cruft pack generation
- builtin/repack.c: support generating a cruft pack
- builtin/pack-objects.c: --cruft with expiration
- reachable: report precise timestamps from objects in cruft packs
- reachable: add options to add_unseen_recent_objects_to_traversal
- builtin/pack-objects.c: --cruft without expiration
- builtin/pack-objects.c: return from create_object_entry()
- t/helper: add 'pack-mtimes' test-tool
- pack-mtimes: support writing pack .mtimes files
- chunk-format.h: extract oid_version()
- pack-write: pass 'struct packing_data' to 'stage_tmp_packfiles'
- pack-mtimes: support reading .mtimes files
- Documentation/technical: add cruft-packs.txt
A mechanism to pack unreachable objects into a "cruft pack",
instead of ejecting them into loose form to be reclaimed later, has
been introduced.
Waiting for discussion to settle.
cf. <YiZI99yeijQe5Jaq@google.com>
source: <cover.1646266835.git.me@ttaylorr.com>
* js/ci-github-workflow-markup (2022-03-01) 9 commits
- ci: call `finalize_test_case_output` a little later
- ci: use `--github-workflow-markup` in the GitHub workflow
- ci: optionally mark up output in the GitHub workflow
- test(junit): avoid line feeds in XML attributes
- tests: refactor --write-junit-xml code
- ci/run-build-and-tests: add some structure to the GitHub workflow output
- ci: make it easier to find failed tests' logs in the GitHub workflow
- ci/run-build-and-tests: take a more high-level view
- ci: fix code style
Update the GitHub workflow support to make it quicker to get to the
failing test.
Waiting for discussion to settle.
cf. <220309.86tuc6lwpj.gmgdl@evledraar.gmail.com>
cf. <220302.86mti87cj2.gmgdl@evledraar.gmail.com>
cf. <30dbc8fb-a1db-05bc-3dcb-070e11cf4715@gmail.com>
source: <pull.1117.v2.git.1646130289.gitgitgadget@gmail.com>
* et/xdiff-indirection (2022-02-17) 1 commit
- xdiff: provide indirection to git functions
Insert a layer of preprocessor macros for common functions in xdiff
codebase.
Expecting a (hopefully final) reroll.
cf. <xmqqbkyudb8n.fsf@gitster.g>
source: <20220217225408.GB7@edef91d97c94>
* ab/http-gcc-12-workaround (2022-02-25) 1 commit
- http API: fix dangling pointer issue noted by GCC 12.0
Work around false warning pre-release of GCC 12.
source: <patch-v2-1.1-777838267a5-20220225T090816Z-avarab@gmail.com>
* jd/prompt-upstream-mark (2022-03-23) 4 commits
(merged to 'next' on 2022-03-23 at 518404a091)
+ git-prompt: put upstream comments together
+ git-prompt: make long upstream state indicator consistent
+ git-prompt: make upstream state indicator location consistent
+ git-prompt: rename `upstream` to `upstream_type`
Tweaks in the command line prompt (in contrib/) code around its
GIT_PS1_SHOWUPSTREAM feature.
Will merge to 'master'.
source: <pull.1162.v2.git.1645991832.gitgitgadget@gmail.com>
* pw/worktree-list-with-z (2022-02-25) 1 commit
- worktree: add -z option for list subcommand
"git worktree list --porcelain" did not c-quote pathnames and lock
reasons with unsafe bytes correctly, which is worked around by
introducing NUL terminated output format with "-z".
Expecting a reroll.
cf. <dd16416d-15c4-7f80-aaf6-a36d101e8928@gmail.com>
source: <pull.1164.git.1645801727732.gitgitgadget@gmail.com>
* rc/fetch-refetch (2022-03-04) 7 commits
- doc/partial-clone: mention --refetch fetch option
- fetch: after refetch, encourage auto gc repacking
- t5615-partial-clone: add test for fetch --refetch
- fetch: add --refetch option
- builtin/fetch-pack: add --refetch option
- fetch-pack: add refetch
- fetch-negotiator: add specific noop initializer
"git fetch --refetch" learned to fetch everything without telling
the other side what we already have, which is useful when you
cannot trust what you have in the local object store.
Expecting a reroll.
cf. <CAFLLRpLiCLiXkHNe2u4TKk-FjDy4LVZZR4qqxG+MamZYEFNUGg@mail.gmail.com>
source: <pull.1138.v3.git.1646406274.gitgitgadget@gmail.com>
* tk/simple-autosetupmerge (2022-02-25) 2 commits
- t3200: tests for new branch.autosetupmerge option "simple"
- merge: new autosetupmerge option 'simple' for matching branches
"git -c branch.autosetupmerge=simple branch $A $B" will set the $B
as $A's upstream only when $A and $B shares the same name, and "git
-c push.default=simple" on branch $A would push to update the
branch $A at the remote $B came from.
Needs review.
source: <pull.1161.v2.git.1645815142.gitgitgadget@gmail.com>
* tk/untracked-cache-with-uall (2022-02-25) 1 commit
- untracked-cache: support '--untracked-files=all' if configured
The performance of the "untracked cache" feature has been improved
when "--untracked-files=<mode>" and "status.showUntrackedFiles"
are combined.
Expecting a reroll.
source: <pull.985.v2.git.1645811564461.gitgitgadget@gmail.com>
* ab/commit-plug-leaks (2022-02-16) 2 commits
- commit: use strbuf_release() instead of UNLEAK()
- commit: fix "author_ident" leak
Leakfixes in the top-level called-once function.
Expecting a reroll.
I think UNLEAK->strbuf_release() is a regression.
source: <cover-0.2-00000000000-20220216T081844Z-avarab@gmail.com>
* jh/builtin-fsmonitor-part3 (2022-03-23) 28 commits
- t7527: test Unicode NFC/NFD handling on MacOS
- t/lib-unicode-nfc-nfd: helper prereqs for testing unicode nfc/nfd
- fsmonitor: on macOS also emit NFC spelling for NFD pathname
- t7527: test FSMonitor on case insensitive+preserving file system
- fsmonitor: never set CE_FSMONITOR_VALID on submodules
- t/perf/p7527: add perf test for builtin FSMonitor
- t7527: FSMonitor tests for directory moves
- fsmonitor: optimize processing of directory events
- fsm-listen-darwin: shutdown daemon if worktree root is moved/renamed
- fsm-health-win32: force shutdown daemon if worktree root moves
- fsm-health-win32: add polling framework to monitor daemon health
- fsmonitor--daemon: stub in health thread
- fsmonitor--daemon: rename listener thread related variables
- fsmonitor--daemon: prepare for adding health thread
- fsmonitor--daemon: cd out of worktree root
- fsm-listen-darwin: ignore FSEvents caused by xattr changes on macOS
- unpack-trees: initialize fsmonitor_has_run_once in o->result
- fsmonitor-settings: NTFS and FAT32 on MacOS are incompatible
- fsmonitor-settings: remote repos on Windows are incompatible
- fsmonitor-settings: remote repos on macOS are incompatible
- fsmonitor-settings: stub in macOS-specific incompatibility checking
- fsmonitor-settings: VFS for Git virtual repos are incompatible
- fsmonitor-settings: stub in Win32-specific incompatibility checking
- fsmonitor-settings: bare repos are incompatible with FSMonitor
- t/helper/fsmonitor-client: create stress test
- t7527: test FSMonitor on repos with Unicode root paths
- fsm-listen-win32: handle shortnames
- Merge branch 'jh/builtin-fsmonitor-part2' into jh/builtin-fsmonitor-part3
(this branch uses jh/builtin-fsmonitor-part2.)
More fsmonitor--daemon.
source: <pull.1143.v3.git.1647973380.gitgitgadget@gmail.com>
* gc/recursive-fetch-with-unused-submodules (2022-03-16) 10 commits
(merged to 'next' on 2022-03-17 at 2813b7b1c3)
+ submodule: fix latent check_has_commit() bug
+ fetch: fetch unpopulated, changed submodules
+ submodule: move logic into fetch_task_create()
+ submodule: extract get_fetch_task()
+ submodule: store new submodule commits oid_array in a struct
+ submodule: inline submodule_commits() into caller
+ submodule: make static functions read submodules from commits
+ t5526: create superproject commits with test helper
+ t5526: stop asserting on stderr literally
+ t5526: introduce test helper to assert on fetches
When "git fetch --recurse-submodules" grabbed submodule commits
that would be needed to recursively check out newly fetched commits
in the superproject, it only paid attention to submodules that are
in the current checkout of the superproject. We now do so for all
submodules that have been run "git submodule init" on.
Will merge to 'master'.
source: <20220308001433.94995-1-chooglen@google.com>
* js/bisect-in-c (2022-02-23) 14 commits
- bisect: no longer try to clean up left-over `.git/head-name` files
- bisect: remove Cogito-related code
- bisect: turn `git bisect` into a full built-in
- bisect: move even the option parsing to `bisect--helper`
- bisect--helper: return only correct exit codes in `cmd_*()`
- bisect--helper: move the `BISECT_STATE` case to the end
- bisect--helper: make `--bisect-state` optional
- bisect--helper: align the sub-command order with git-bisect.sh
- bisect--helper: using `--bisect-state` without an argument is a bug
- bisect--helper: really retire `--bisect-autostart`
- bisect--helper: really retire --bisect-next-check
- bisect--helper: retire the --no-log option
- bisect: avoid double-quoting when printing the failed command
- bisect run: fix the error message
Final bits of "git bisect.sh" have been rewritten in C.
Expecting a reroll.
cf. <220225.86ilt27uln.gmgdl@evledraar.gmail.com>
source: <pull.1132.v2.git.1645547423.gitgitgadget@gmail.com>
* js/scalar-diagnose (2022-02-06) 6 commits
- scalar: teach `diagnose` to gather loose objects information
- scalar: teach `diagnose` to gather packfile info
- scalar diagnose: include disk space information
- scalar: add `diagnose`
- scalar: validate the optional enlistment argument
- archive: optionally add "virtual" files
Implementation of "scalar diagnose" subcommand.
On hold.
cf. <nycvar.QRO.7.76.6.2203012353090.11118@tvgsbejvaqbjf.bet>
source: <pull.1128.v2.git.1644187146.gitgitgadget@gmail.com>
* en/merge-tree (2022-02-23) 13 commits
- git-merge-tree.txt: add a section on potentional usage mistakes
- merge-tree: add a --allow-unrelated-histories flag
- merge-tree: allow `ls-files -u` style info to be NUL terminated
- merge-tree: provide easy access to `ls-files -u` style info
- merge-tree: provide a list of which files have conflicts
- merge-ort: provide a merge_get_conflicted_files() helper function
- merge-tree: support including merge messages in output
- merge-ort: split out a separate display_update_messages() function
- merge-tree: implement real merges
- merge-tree: add option parsing and initial shell for real merge function
- merge-tree: move logic for existing merge into new function
- merge-tree: rename merge_trees() to trivial_merge_trees()
- Merge branch 'en/remerge-diff' into en/merge-trees
A new command is introduced that takes two commits and computes a
tree that would be contained in the resulting merge commit, if the
histories leading to these two commits were to be merged, and is
added as a new mode of "git merge-tree" subcommand.
On hold.
cf. <CABPp-BGZ7OAYRR5YKRsxJSo-C=ho+qcNAkqwkim8CkhCfCeHsA@mail.gmail.com>
source: <pull.1122.v6.git.1645602413.gitgitgadget@gmail.com>
* jh/p4-various-fixups (2022-02-10) 22 commits
- git-p4: sort imports
- git-p4: seperate multiple statements onto seperate lines
- git-p4: move inline comments to line above
- git-p4: only seperate code blocks by a single empty line
- git-p4: compare to singletons with "is" and "is not"
- git-p4: normalize indentation of lines in conditionals
- git-p4: ensure there is a single space around all operators
- git-p4: ensure every comment has a single #
- git-p4: remove spaces between dictionary keys and colons
- git-p4: remove redundant backslash-continuations inside brackets
- git-p4: remove extraneous spaces before function arguments
- git-p4: place a single space after every comma
- git-p4: removed brackets when assigning multiple return values
- git-p4: remove spaces around default arguments
- git-p4: remove padding from lists, tuples and function arguments
- git-p4: sort and de-duplcate pylint disable list
- git-p4: remove commented code
- git-p4: convert descriptive class and function comments into docstrings
- git-p4: improve consistency of docstring formatting
- git-p4: indent with 4-spaces
- git-p4: remove unneeded semicolons from statements
- git-p4: add blank lines between functions and class definitions
Various cleanups to "git p4".
source: <20220210164627.279520-1-jholdsworth@nvidia.com>
* js/use-builtin-add-i (2021-12-01) 2 commits
- add -i: default to the built-in implementation
- t2016: require the PERL prereq only when necessary
"git add -i" was rewritten in C some time ago and has been in
testing; the reimplementation is now exposed to general public by
default.
On hold.
What's the status of the "known breakage"?
Are we ready to switch if we wanted to?
There are known breakages on macOS.
cf. <nycvar.QRO.7.76.6.2112021832060.63@tvgsbejvaqbjf.bet>
source: <pull.1087.git.1638281655.gitgitgadget@gmail.com>
* jh/builtin-fsmonitor-part2 (2022-03-23) 29 commits
- t7527: test status with untracked-cache and fsmonitor--daemon
- fsmonitor: force update index after large responses
- fsmonitor--daemon: use a cookie file to sync with file system
- fsmonitor--daemon: periodically truncate list of modified files
- t/perf/p7519: add fsmonitor--daemon test cases
- t/perf/p7519: speed up test on Windows
- t/helper/test-chmtime: skip directories on Windows
- t/perf: avoid copying builtin fsmonitor files into test repo
- t7527: create test for fsmonitor--daemon
- t/helper/fsmonitor-client: create IPC client to talk to FSMonitor Daemon
- help: include fsmonitor--daemon feature flag in version info
- fsmonitor--daemon: implement handle_client callback
- compat/fsmonitor/fsm-listen-darwin: implement FSEvent listener on MacOS
- compat/fsmonitor/fsm-listen-darwin: add MacOS header files for FSEvent
- compat/fsmonitor/fsm-listen-win32: implement FSMonitor backend on Windows
- fsmonitor--daemon: create token-based changed path cache
- fsmonitor--daemon: define token-ids
- fsmonitor--daemon: add pathname classification
- fsmonitor--daemon: implement 'start' command
- fsmonitor--daemon: implement 'run' command
- compat/fsmonitor/fsm-listen-darwin: stub in backend for Darwin
- compat/fsmonitor/fsm-listen-win32: stub in backend for Windows
- fsmonitor--daemon: implement 'stop' and 'status' commands
- fsmonitor--daemon: add a built-in fsmonitor daemon
- fsmonitor: document builtin fsmonitor
- fsmonitor: use IPC to query the builtin FSMonitor daemon
- fsmonitor: config settings are repository-specific
- fsmonitor-ipc: create client routines for git-fsmonitor--daemon
- fsmonitor: enhance existing comments, clarify trivial response handling
(this branch is used by jh/builtin-fsmonitor-part3.)
Built-in fsmonitor (part 2).
Expecting a roroll that is hopefully the final one.
cf. <eb503dec-4a30-dd29-ac65-a8924fa178d6@jeffhostetler.com>
source: <pull.1041.v7.git.1647972010.gitgitgadget@gmail.com>
* es/superproject-aware-submodules (2022-03-09) 3 commits
. rev-parse: short-circuit superproject worktree when config unset
. introduce submodule.hasSuperproject record
. t7400-submodule-basic: modernize inspect() helper
A configuration variable in a repository tells if it is (or is not)
a submodule of a superproject.
Expecting a reroll.
cf. <kl6l4k45s7cb.fsf@chooglen-macbookpro.roam.corp.google.com>
source: <20220310004423.2627181-1-emilyshaffer@google.com>
--------------------------------------------------
[Discarded]
* jc/parse-options-check (2022-03-01) 1 commit
. parse-options: make parse_options_check() test-only
Bypass sanity checks on the options array at runtime, and trigger
them only during the tests.
source: <xmqqr17lphav.fsf_-_@gitster.g>
* jc/merge-continue-doc (2022-02-28) 1 commit
. merge: 'git merge --continue' is merely 'git commit'
"git merge" documentation clarifies that "git commit" is sufficient
to conclude an interrupted merge.
source: <xmqq1qzmy55g.fsf@gitster.g>
^ permalink raw reply [flat|nested] 6+ messages in thread
* ab/commit-plug-leaks (was: What's cooking in git.git (Mar 2022, #05; Wed, 23))
2022-03-24 3:13 What's cooking in git.git (Mar 2022, #05; Wed, 23) Junio C Hamano
@ 2022-03-25 13:38 ` Ævar Arnfjörð Bjarmason
2022-03-26 16:05 ` fr/vimdiff-layout " Ævar Arnfjörð Bjarmason
1 sibling, 0 replies; 6+ messages in thread
From: Ævar Arnfjörð Bjarmason @ 2022-03-25 13:38 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git
On Wed, Mar 23 2022, Junio C Hamano wrote:
> * ab/commit-plug-leaks (2022-02-16) 2 commits
> - commit: use strbuf_release() instead of UNLEAK()
> - commit: fix "author_ident" leak
>
> Leakfixes in the top-level called-once function.
>
> Expecting a reroll.
> I think UNLEAK->strbuf_release() is a regression.
> source: <cover-0.2-00000000000-20220216T081844Z-avarab@gmail.com>
Re our earlier exchange ending in
https://lore.kernel.org/git/xmqqczjbj0nf.fsf@gitster.g/ I still think it
makes sense to get rid of the UNLEAK() there.
One reason not mentioned there (but which I do find useful) is that if
we actually free the memory then you don't need to build with
-DSUPPRESS_ANNOTATED_LEAKS to suppress these, which is useful e.g. when
looking at valgrind output, as opposed to SANITIZE=leak where we do add
-DSUPPRESS_ANNOTATED_LEAKS.
And since I submitted this topic our number of UNLEAK() in builtin/ is
down from 29 to 23 with the queued release_revisions() topic.
But you seem to feel strongly that we should keep these specific
UNLEAK() for reasons I don't really understand despite re-reading that
exchange. I.e. the cost of doing the actual release is minuscule, and we
have a lot of such strbuf_release() in builtin/*.c already.
But if you'd just like to drop this topic I understand, but I think it's
ready to advance as is, but either way it's probably good to get it out
of the current status
^ permalink raw reply [flat|nested] 6+ messages in thread
* fr/vimdiff-layout (was: What's cooking in git.git (Mar 2022, #05; Wed, 23))
2022-03-24 3:13 What's cooking in git.git (Mar 2022, #05; Wed, 23) Junio C Hamano
2022-03-25 13:38 ` ab/commit-plug-leaks (was: What's cooking in git.git (Mar 2022, #05; Wed, 23)) Ævar Arnfjörð Bjarmason
@ 2022-03-26 16:05 ` Ævar Arnfjörð Bjarmason
2022-03-26 22:55 ` Fernando Ramos
1 sibling, 1 reply; 6+ messages in thread
From: Ævar Arnfjörð Bjarmason @ 2022-03-26 16:05 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git, Fernando Ramos
On Wed, Mar 23 2022, Junio C Hamano wrote:
> * fr/vimdiff-layout (2022-03-23) 3 commits
> - vimdiff: integrate layout tests in the unit tests framework ('t' folder)
> - vimdiff: add tool documentation
> - vimdiff: new implementation with layout support
>
> Reimplement "vimdiff[123]" mergetool drivers with a more generic
> layout mechanism.
>
> Will merge to 'next'?
> source: <20220319091141.4911-1-greenfoo@u92.eu>
It looks like it's emitting a new warning from the "Makefile" in
check-docs:
$ (make clean && make check-docs) >/dev/null 2>&1; make check-docs
make -C Documentation lint-docs
make[1]: Entering directory '/home/avar/g/git/Documentation'
make[1]: Nothing to be done for 'lint-docs'.
make[1]: Leaving directory '/home/avar/g/git/Documentation'
removed but documented: git-difftool--vimdiff
removed but documented: git-mergetool--vimdiff
removed but documented: git-version
Re https://lore.kernel.org/git/87o88i2keu.fsf@evledraar.gmail.com/ I
haven't checked if this is the same case of a thing we should just
ignore, or if it's raising an actual issue this time.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: fr/vimdiff-layout (was: What's cooking in git.git (Mar 2022, #05; Wed, 23))
2022-03-26 16:05 ` fr/vimdiff-layout " Ævar Arnfjörð Bjarmason
@ 2022-03-26 22:55 ` Fernando Ramos
2022-03-27 0:29 ` fr/vimdiff-layout Junio C Hamano
0 siblings, 1 reply; 6+ messages in thread
From: Fernando Ramos @ 2022-03-26 22:55 UTC (permalink / raw)
To: Ævar Arnfjörð Bjarmason; +Cc: Junio C Hamano, git
> It looks like it's emitting a new warning from the "Makefile" in
> check-docs:
>
> $ (make clean && make check-docs) >/dev/null 2>&1; make check-docs
> make -C Documentation lint-docs
> make[1]: Entering directory '/home/avar/g/git/Documentation'
> make[1]: Nothing to be done for 'lint-docs'.
> make[1]: Leaving directory '/home/avar/g/git/Documentation'
> removed but documented: git-difftool--vimdiff
> removed but documented: git-mergetool--vimdiff
> removed but documented: git-version
Looking at how the Makefile works it looks like this error is triggered
because...
1. I have created these two new files:
- Documentation/git-difftool--vimdiff.txt
- Documentation/git-mergetool--vimdiff.txt
2. None of them are real programs (such as "git-clone") or scripts (such as
"git-mergetool--lib.sh")
All the other "Documentation/*.txt" files are associated to "something" that
can be executed, but not these two (they are only meant to be accessed from "git
help" / "man").
Options I can think of:
A) Ignore the warning message
B) Remove these two files and add all this documentation to an already
existing one (maybe "Documentation/git-mergetool--lib.txt")
C) Create a new variable in the Makefile to contain a list of "documentation
aliases" that do not correspond to a "real" command, so that they can be
filtered out when testing for documentation problems.
In other to implement (C) we could do something like this:
> diff --git a/Makefile b/Makefile
> index 70f0a004e7..db8a1c8025 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -597,6 +597,7 @@ TEST_BUILTINS_OBJS =
> TEST_OBJS =
> TEST_PROGRAMS_NEED_X =
> THIRD_PARTY_SOURCES =
> +DOC_ALIASES =
>
> # Having this variable in your environment would break pipelines because
> # you cause "cd" to echo its destination to stdout. It can also take
> @@ -1228,6 +1229,11 @@ THIRD_PARTY_SOURCES += compat/regex/%
> THIRD_PARTY_SOURCES += sha1collisiondetection/%
> THIRD_PARTY_SOURCES += sha1dc/%
>
> +# DOC ALIASES is a list of topics you can call "git help" on but they are no
> +# real commands or scripts you can execute
> +DOC_ALIASES += git-difftool--vimdiff
> +DOC_ALIASES += git-mergetool--vimdiff
> +
> # xdiff and reftable libs may in turn depend on what is in libgit.a
> GITLIBS = common-main.o $(LIB_FILE) $(XDIFF_LIB) $(REFTABLE_LIB) $(LIB_FILE)
> EXTLIBS =
> @@ -3355,7 +3361,7 @@ check-docs::
> -e 's/\.txt//'; \
> ) | while read how cmd; \
> do \
> - case " $(patsubst %$X,%,$(ALL_COMMANDS) $(BUILT_INS) $(EXCLUDED_PROGRAMS)) " in \
> + case " $(patsubst %$X,%,$(ALL_COMMANDS) $(BUILT_INS) $(EXCLUDED_PROGRAMS) $(DOC_ALIASES)) " in \
> *" $$cmd "*) ;; \
> *) echo "removed but $$how: $$cmd" ;; \
> esac; \
Let me know what you think. Thanks!
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: fr/vimdiff-layout
2022-03-26 22:55 ` Fernando Ramos
@ 2022-03-27 0:29 ` Junio C Hamano
2022-03-27 13:18 ` [PATCH] tests: do roundtrip builtin doc & sanity checking Ævar Arnfjörð Bjarmason
0 siblings, 1 reply; 6+ messages in thread
From: Junio C Hamano @ 2022-03-27 0:29 UTC (permalink / raw)
To: Fernando Ramos; +Cc: Ævar Arnfjörð Bjarmason, git
Fernando Ramos <greenfoo@u92.eu> writes:
>> It looks like it's emitting a new warning from the "Makefile" in
>> check-docs:
>>
>> $ (make clean && make check-docs) >/dev/null 2>&1; make check-docs
>> make -C Documentation lint-docs
>> make[1]: Entering directory '/home/avar/g/git/Documentation'
>> make[1]: Nothing to be done for 'lint-docs'.
>> make[1]: Leaving directory '/home/avar/g/git/Documentation'
>> removed but documented: git-difftool--vimdiff
>> removed but documented: git-mergetool--vimdiff
>> removed but documented: git-version
>
> Looking at how the Makefile works it looks like this error is triggered
> because...
>
> 1. I have created these two new files:
> - Documentation/git-difftool--vimdiff.txt
> - Documentation/git-mergetool--vimdiff.txt
>
> 2. None of them are real programs (such as "git-clone") or scripts (such as
> "git-mergetool--lib.sh")
>
> All the other "Documentation/*.txt" files are associated to "something" that
> can be executed, but not these two (they are only meant to be accessed from "git
> help" / "man").
Thanks for noticing and reporting, Ævar.
I think the right place to describe how vimdiff or other
configuration should be configured should live next to configuration
documentation for other backends.
Documentation/git-mergetool.txt is the main entry point for those
who want to learn about "git mergetool", i.e. "git mergetool --help"
shows what's in there.
The documentation talks about the "mergetool" front-end, and then
includes config/mergetool.txt for the configuration files.
After all, the topic adds only one mergetool.<tool>.layout
configuration variable. The file config/mergetool.txt would be the
place to describe that variable, after the entry for
mergetool.meld.useAutoMerge, which is already is about a variable
that is specific to a particular backend. If we can successfully
can go this route, we do not need any new file added at all.
Alternatively, in the longer run, we may want backend specific
information in the "git mergetool --help" documentation. Maybe
vimdiff is the first and currently only such backend that wants
documentation specific to it, but it does not has to stay that way
forever.
So adding a new section "BACKENDS SPECIFIC HINTS" after "TEMPORARY
FILES" section, and add "VIMDIFF" as its first (and currently only)
subsection, would be a reasonable thing to do. Create a
Documentation/mergetools/ subdirectory, add vimdiff.txt file in
there, move the most of what is in git-mergetool--vimdiff.txt, and
include it from Documentation/git-mergetool.txt, perhaps like the
attached patch outlines?
diff --git c/Documentation/config/mergetool.txt w/Documentation/config/mergetool.txt
index cafbbef46a..19ca39d43d 100644
--- c/Documentation/config/mergetool.txt
+++ w/Documentation/config/mergetool.txt
@@ -45,6 +45,11 @@ mergetool.meld.useAutoMerge::
value of `false` avoids using `--auto-merge` altogether, and is the
default value.
+mergetool.vimdiff.layout::
+ The vimdiff backend uses this variable to control how its split
+ windows look like. See BACKEND SPECIFIC HINTS section of
+ linkgit:git-mergetool[1] for details.
+
mergetool.hideResolved::
During a merge Git will automatically resolve as many conflicts as
possible and write the 'MERGED' file containing conflict markers around
diff --git c/Documentation/git-mergetool.txt w/Documentation/git-mergetool.txt
index e587c7763a..6cf3734544 100644
--- c/Documentation/git-mergetool.txt
+++ w/Documentation/git-mergetool.txt
@@ -113,6 +113,16 @@ Setting the `mergetool.keepBackup` configuration variable to `false`
causes `git mergetool` to automatically remove the backup as files
are successfully merged.
+BACKEND SPECIFIC HINTS
+----------------------
+
+Here we'll give backend specific hints.
+
+vimdiff
+~~~~~~~
+include::mergetools/vimdiff.txt[]
+
+
GIT
---
Part of the linkgit:git[1] suite
diff --git c/Documentation/mergetools/vimdiff.txt w/Documentation/mergetools/vimdiff.txt
new file mode 100644
index 0000000000..1cac121283
--- /dev/null
+++ w/Documentation/mergetools/vimdiff.txt
@@ -0,0 +1,11 @@
+vimdiff
+~~~~~~~
+
+Vimdiff backend allows `mergetools.vimdiff.layout` to specify how
+the split window is used ...
+
+Layout
+^^^^^^
+
+Text.
+
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH] tests: do roundtrip builtin doc & sanity checking
2022-03-27 0:29 ` fr/vimdiff-layout Junio C Hamano
@ 2022-03-27 13:18 ` Ævar Arnfjörð Bjarmason
0 siblings, 0 replies; 6+ messages in thread
From: Ævar Arnfjörð Bjarmason @ 2022-03-27 13:18 UTC (permalink / raw)
To: git
Cc: Junio C Hamano, Fernando Ramos, Matthias Aßhauer,
Lars Schneider, Ævar Arnfjörð Bjarmason
Replace the part of "make check-docs" first added in [1] and the
entirety of "make check-builtins" first added in [2] with checks that
do checking against --list-cmds=main (see [3]) and that our generated
"man" docs instead.
The "check-docs" part of this was mostly broken anyway, in that we
were ignoring the exit code. Since b6d8887d3d6 (documentation: add
documentation for 'git version', 2021-09-14) we started emitting:
$ make -s check-docs
removed but documented: git-version
But as noted in [4] the check didn't fail.
By checking that we get the man page when running "git $cmd --help" we
can be sure that we don't miss anything. To do this add a
GIT_TEST_MANPATH, as we don't want to append to the manpath as we'd
pick up the MANPATH on the system.
There is no replacement provided for the "$base is builtin but
$builtin.$sfx still exists" part of the "check-builtins" check being
removed here. Back when it was added various commands were being
migrated to C at a rapid rate, now we have just a few stragglers
in *.sh and *.perl. It's unlikely that we'd forget to remove the old
code.
1. 8c989ec5288 (Makefile: $(MAKE) check-docs, 2006-04-13)
2. c74390e4a1d (cherry is built-in, do not ship git-cherry.sh,
2006-11-05)
3. 6bb2dc0b947 (completion: implement and use --list-cmds=main,others,
2018-05-20)
4. https://lore.kernel.org/git/87o88i2keu.fsf@evledraar.gmail.com/
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
---
Documentation/Makefile | 3 --
Makefile | 39 +----------------
builtin/help.c | 12 +++++-
check-builtins.sh | 34 ---------------
ci/install-dependencies.sh | 3 ++
t/t0012-help.sh | 86 +++++++++++++++++++++++++++++++++++++-
6 files changed, 101 insertions(+), 76 deletions(-)
delete mode 100755 check-builtins.sh
diff --git a/Documentation/Makefile b/Documentation/Makefile
index 1eb9192dae8..a2c6ef479e0 100644
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -431,9 +431,6 @@ require-htmlrepo::
quick-install-html: require-htmlrepo
'$(SHELL_PATH_SQ)' ./install-doc-quick.sh $(HTML_REPO) $(DESTDIR)$(htmldir) $(GIT_MAN_REF)
-print-man1:
- @for i in $(MAN1_TXT); do echo $$i; done
-
## Lint: gitlink
LINT_DOCS_GITLINK = $(patsubst %.txt,.build/lint-docs/gitlink/%.ok,$(HOWTO_TXT) $(DOC_DEP_TXT))
$(LINT_DOCS_GITLINK): lint-gitlink.perl
diff --git a/Makefile b/Makefile
index e8aba291d7f..c5b83f80a3a 100644
--- a/Makefile
+++ b/Makefile
@@ -3331,46 +3331,11 @@ ALL_COMMANDS += gitweb
.PHONY: check-docs
check-docs::
$(MAKE) -C Documentation lint-docs
- @(for v in $(patsubst %$X,%,$(ALL_COMMANDS)); \
- do \
- case "$$v" in \
- git-merge-octopus | git-merge-ours | git-merge-recursive | \
- git-merge-resolve | git-merge-subtree | \
- git-fsck-objects | git-init-db | \
- git-remote-* | git-stage | git-legacy-* | \
- git-?*--?* ) continue ;; \
- esac ; \
- test -f "Documentation/$$v.txt" || \
- echo "no doc: $$v"; \
- sed -e '1,/^### command list/d' -e '/^#/d' command-list.txt | \
- grep -q "^$$v[ ]" || \
- case "$$v" in \
- git) ;; \
- *) echo "no link: $$v";; \
- esac ; \
- done; \
- ( \
- sed -e '1,/^### command list/d' \
- -e '/^#/d' \
- -e '/guide$$/d' \
- -e 's/[ ].*//' \
- -e 's/^/listed /' command-list.txt; \
- $(MAKE) -C Documentation print-man1 | \
- grep '\.txt$$' | \
- sed -e 's|^|documented |' \
- -e 's/\.txt//'; \
- ) | while read how cmd; \
- do \
- case " $(patsubst %$X,%,$(ALL_COMMANDS) $(BUILT_INS) $(EXCLUDED_PROGRAMS)) " in \
- *" $$cmd "*) ;; \
- *) echo "removed but $$how: $$cmd" ;; \
- esac; \
- done ) | sort
### Make sure built-ins do not have dups and listed in git.c
#
-check-builtins::
- ./check-builtins.sh
+check-builtins:: all man
+ $(MAKE) -C t T=t0012-help.sh
### Test suite coverage testing
#
diff --git a/builtin/help.c b/builtin/help.c
index 222f994f863..775eee76c05 100644
--- a/builtin/help.c
+++ b/builtin/help.c
@@ -434,7 +434,7 @@ static const char *cmd_to_page(const char *git_cmd)
return xstrfmt("git%s", git_cmd);
}
-static void setup_man_path(void)
+static void setup_real_man_path(void)
{
struct strbuf new_path = STRBUF_INIT;
const char *old_path = getenv("MANPATH");
@@ -455,6 +455,16 @@ static void setup_man_path(void)
strbuf_release(&new_path);
}
+static void setup_man_path(void)
+{
+ const char *test_manpath = getenv("GIT_TEST_MANPATH");
+
+ if (test_manpath)
+ xsetenv("MANPATH", test_manpath, 1);
+ else
+ setup_real_man_path();
+}
+
static void exec_viewer(const char *name, const char *page)
{
const char *info = get_man_viewer_info(name);
diff --git a/check-builtins.sh b/check-builtins.sh
deleted file mode 100755
index a0aaf3a3473..00000000000
--- a/check-builtins.sh
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/sh
-
-{
- cat <<\EOF
-sayIt:
- $(foreach b,$(BUILT_INS),echo XXX $(b:$X=) YYY;)
-EOF
- cat Makefile
-} |
-make -f - sayIt 2>/dev/null |
-sed -n -e 's/.*XXX \(.*\) YYY.*/\1/p' |
-sort |
-{
- bad=0
- while read builtin
- do
- base=$(expr "$builtin" : 'git-\(.*\)')
- x=$(sed -ne 's/.*{ "'$base'", \(cmd_[^, ]*\).*/'$base' \1/p' git.c)
- if test -z "$x"
- then
- echo "$base is builtin but not listed in git.c command list"
- bad=1
- fi
- for sfx in sh perl py
- do
- if test -f "$builtin.$sfx"
- then
- echo "$base is builtin but $builtin.$sfx still exists"
- bad=1
- fi
- done
- done
- exit $bad
-}
diff --git a/ci/install-dependencies.sh b/ci/install-dependencies.sh
index dbcebad2fb2..1df7c908db0 100755
--- a/ci/install-dependencies.sh
+++ b/ci/install-dependencies.sh
@@ -71,6 +71,9 @@ Documentation)
test -n "$ALREADY_HAVE_ASCIIDOCTOR" ||
sudo gem install --version 1.5.8 asciidoctor
+
+ sudo apt-get -q -y install libcurl4-openssl-dev libssl-dev \
+ libexpat-dev gettext make
;;
linux-gcc-default)
sudo apt-get -q update
diff --git a/t/t0012-help.sh b/t/t0012-help.sh
index 6c3e1f7159d..522eb1b492d 100755
--- a/t/t0012-help.sh
+++ b/t/t0012-help.sh
@@ -234,7 +234,9 @@ test_expect_success "'git help -g' section spacing" '
test_expect_success 'generate builtin list' '
mkdir -p sub &&
- git --list-cmds=builtins >builtins
+ git --list-cmds=builtins >builtins &&
+ uniq builtins >builtins.uniq &&
+ test_cmp builtins builtins.uniq
'
while read builtin
@@ -249,4 +251,86 @@ do
'
done <builtins
+
+symlink_test_manpath () {
+ local doc="$GIT_BUILD_DIR"/Documentation &&
+ test_path_exists "$doc"/git-add.1 &&
+ test_when_finished "rm -f man1" &&
+ ln -s "$doc" man1
+}
+
+# Use "git-add" as a guinea pig, and check the basic sanity of the
+# output.
+test_lazy_prereq HAVE_BUILT_DOCS '
+ symlink_test_manpath &&
+ test_when_finished "rm -f man.txt" &&
+ GIT_TEST_MANPATH="$PWD" git add --help >man.txt &&
+ grep GIT-ADD man.txt &&
+ grep ^SYNOPSIS man.txt
+'
+
+is_documented () {
+ cat >undocumented <<-\EOF
+ add--interactive
+ bisect--helper
+ checkout--worker
+ difftool--helper
+ env--helper
+ merge-octopus
+ merge-ours
+ merge-recursive
+ merge-recursive-ours
+ merge-recursive-theirs
+ merge-resolve
+ merge-subtree
+ pickaxe
+ remote-ftp
+ remote-ftps
+ remote-http
+ remote-https
+ submodule--helper
+ upload-archive--writer
+ EOF
+ ! grep -q "^$1$" undocumented
+}
+
+test_undocumented () {
+ cmd=$1 &&
+ test_expect_success HAVE_BUILT_DOCS "$cmd does not have --help documentation" '
+ symlink_test_manpath &&
+ test_when_finished "rm -f man.txt" &&
+ test_must_fail env GIT_TEST_MANPATH="$PWD" git $cmd --help >man.txt
+ '
+}
+
+test_documented () {
+ cmd=$1 &&
+ test_expect_success HAVE_BUILT_DOCS "$cmd can handle --help" '
+ symlink_test_manpath &&
+ test_when_finished "rm -f man.txt" &&
+ GIT_TEST_MANPATH="$PWD" git $cmd --help >man.txt &&
+ grep "git-$cmd" man.txt
+ '
+}
+
+test_expect_success 'generate main list' '
+ mkdir -p sub &&
+ git --list-cmds=main >main
+'
+
+while read cmd
+do
+ case "$cmd" in
+ *.sh|*.perl|*.py)
+ continue
+ ;;
+ esac &&
+ if is_documented "$cmd"
+ then
+ test_documented "$cmd"
+ else
+ test_undocumented "$cmd"
+ fi
+done <main
+
test_done
--
2.35.1.1535.gc79a163ff4c
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2022-03-27 13:18 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-03-24 3:13 What's cooking in git.git (Mar 2022, #05; Wed, 23) Junio C Hamano
2022-03-25 13:38 ` ab/commit-plug-leaks (was: What's cooking in git.git (Mar 2022, #05; Wed, 23)) Ævar Arnfjörð Bjarmason
2022-03-26 16:05 ` fr/vimdiff-layout " Ævar Arnfjörð Bjarmason
2022-03-26 22:55 ` Fernando Ramos
2022-03-27 0:29 ` fr/vimdiff-layout Junio C Hamano
2022-03-27 13:18 ` [PATCH] tests: do roundtrip builtin doc & sanity checking Ævar Arnfjörð Bjarmason
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).