To: git@vger.kernel.org
Bcc: lwn@lwn.net
-Subject: What's cooking in git.git (Feb 2022, #01; Thu, 3)
-X-master-at: 5d01301f2b865aa8dba1654d3f447ce9d21db0b5
-X-next-at: 69c8d7142f0a3c3f513ac30b2a4a88fb47e1d1b1
+Subject: What's cooking in git.git (Feb 2022, #02; Wed, 9)
+X-master-at: 2b9c1209706bc2ef0ab09fb0bdc7d405e225ce8b
+X-next-at: b22f109932d866f1f13b0e1a07d0c3b42268a14f
-What's cooking in git.git (Feb 2022, #01; Thu, 3)
+What's cooking in git.git (Feb 2022, #02; Wed, 9)
--------------------------------------------------
Here are the topics that have been cooking in my tree. Commits
'seen'. The ones marked with '.' do not appear in any of the
integration branches, but I am still holding onto them.
-Will merge a bunch of topics as the first batch in this cycle down
-to 'master' (aka 'main'), hopefully tomorrow.
+The second batch of topics have been merged.
Many new topics have sketchy or even empty topic description in the
list below; help to fill them in is very much appreciated ;-)
--------------------------------------------------
[Graduated to 'master']
-* en/keep-cwd (2022-01-26) 1 commit
- (merged to 'next' on 2022-01-26 at b2518a683c)
- + sequencer, stash: fix running from worktree subdir
+* ab/cat-file (2022-01-12) 12 commits
+ (merged to 'next' on 2022-01-12 at ee4d43041d)
+ + cat-file: s/_/-/ in typo'd usage_msg_optf() message
+ + cat-file: don't whitespace-pad "(...)" in SYNOPSIS and usage output
+ (merged to 'next' on 2022-01-05 at e145efa605)
+ + cat-file: use GET_OID_ONLY_TO_DIE in --(textconv|filters)
+ + object-name.c: don't have GET_OID_ONLY_TO_DIE imply *_QUIETLY
+ + cat-file: correct and improve usage information
+ + cat-file: fix remaining usage bugs
+ + cat-file: make --batch-all-objects a CMDMODE
+ + cat-file: move "usage" variable to cmd_cat_file()
+ + cat-file docs: fix SYNOPSIS and "-h" output
+ + parse-options API: add a usage_msg_optf()
+ + cat-file tests: test messaging on bad objects/paths
+ + cat-file tests: test bad usage
- Fix a regression in 2.35 that roke the use of "rebase" and "stash"
- in a secondary worktree.
- source: <pull.1205.git.git.1643161426138.gitgitgadget@gmail.com>
+ Assorted updates to "git cat-file", especially "-h".
+ source: <cover-v6-00.10-00000000000-20211228T132637Z-avarab@gmail.com>
+ source: <cover-0.2-00000000000-20220110T220553Z-avarab@gmail.com>
---------------------------------------------------
-[New Topics]
-* jt/clone-not-quite-empty (2022-01-26) 1 commit
- (merged to 'next' on 2022-01-26 at c3bb39676e)
- + clone: support unusual remote ref configurations
+* ab/config-based-hooks-2 (2022-01-07) 17 commits
+ (merged to 'next' on 2022-01-19 at 594b6da22c)
+ + run-command: remove old run_hook_{le,ve}() hook API
+ + receive-pack: convert push-to-checkout hook to hook.h
+ + read-cache: convert post-index-change to use hook.h
+ + commit: convert {pre-commit,prepare-commit-msg} hook to hook.h
+ + git-p4: use 'git hook' to run hooks
+ + send-email: use 'git hook run' for 'sendemail-validate'
+ + git hook run: add an --ignore-missing flag
+ + hooks: convert worktree 'post-checkout' hook to hook library
+ + hooks: convert non-worktree 'post-checkout' hook to hook library
+ + merge: convert post-merge to use hook.h
+ + am: convert applypatch-msg to use hook.h
+ + rebase: convert pre-rebase to use hook.h
+ + hook API: add a run_hooks_l() wrapper
+ + am: convert {pre,post}-applypatch to use hook.h
+ + gc: use hook library for pre-auto-gc hook
+ + hook API: add a run_hooks() wrapper
+ + hook: add 'run' subcommand
- Cloning from a repository that does not yet have any branches or
- tags but has other refs resulted in a "remote transport reported
- error", which has been corrected.
+ More "config-based hooks".
+ source: <cover-v6-00.17-00000000000-20211222T035755Z-avarab@gmail.com>
- Will merge to 'master'.
- source: <20220124180909.2437002-1-jonathantanmy@google.com>
+* en/merge-ort-restart-optim-fix (2022-01-17) 1 commit
+ (merged to 'next' on 2022-01-19 at 84da10b057)
+ + merge-ort: avoid assuming all renames detected
-* ab/no-errno-from-resolve-ref-unsafe (2022-01-26) 2 commits
- - refs API: remove "failure_errno" from refs_resolve_ref_unsafe()
- - sequencer: don't use die_errno() on refs_resolve_ref_unsafe() failure
+ The merge-ort misbehaved when merge.renameLimit configuration is
+ set too low and failed to find all renames.
+ source: <pull.1194.v2.git.git.1642443955836.gitgitgadget@gmail.com>
- Remaining code-clean-up.
- Will merge to 'next'.
- source: <cover-v4-0.2-00000000000-20220126T143427Z-avarab@gmail.com>
+* en/plug-leaks-in-merge (2022-01-21) 2 commits
+ (merged to 'next' on 2022-01-26 at 0cf6aa0a2b)
+ + merge: fix memory leaks in cmd_merge()
+ + merge-ort: fix memory leak in merge_ort_internal()
+ Leakfix.
+ source: <pull.1200.git.git.1642664835.gitgitgadget@gmail.com>
-* gh/doc-typos (2022-01-26) 2 commits
- - Documentation/config/pgp.txt: add missing apostrophe
- - Documentation/config/pgp.txt: replace stray <TAB> character with <SPC>
- Typofix.
+* fs/ssh-signing-crlf (2022-01-07) 1 commit
+ (merged to 'next' on 2022-01-19 at 76b86faafb)
+ + gpg-interface: trim CR from ssh-keygen
- Will merge to 'next'.
- source: <20220126121426.53799-1-greg@hurrell.net>
+ The code path that verifies signatures made with ssh were made to
+ work better on a system with CRLF line endings.
+ source: <20220107090735.580225-1-fs@gigacodes.de>
-* jc/doc-log-messages (2022-01-27) 3 commits
- - SubmittingPatches: explain why we care about log messages
- - CodingGuidelines: hint why we value clearly written log messages
- - SubmittingPatches: write problem statement in the log in the present tense
+* gc/fetch-negotiate-only-early-return (2022-01-20) 4 commits
+ (merged to 'next' on 2022-01-20 at e7616428eb)
+ + fetch: help translators by reusing the same message template
+ (merged to 'next' on 2022-01-19 at 0f15147cfa)
+ + fetch --negotiate-only: do not update submodules
+ + fetch: skip tasks related to fetching objects
+ + fetch: use goto cleanup in cmd_fetch()
- Update the contributor-facing documents on proposed log messages.
+ "git fetch --negotiate-only" is an internal command used by "git
+ push" to figure out which part of our history is missing from the
+ other side. It should never recurse into submodules even when
+ fetch.recursesubmodules configuration variable is set, nor it
+ should trigger "gc". The code has been tightened up to ensure it
+ only does common ancestry discovery and nothing else.
+ source: <20220119000056.58503-1-chooglen@google.com>
- Will merge to 'next'?
- source: <20220126234205.2923388-1-gitster@pobox.com>
+* jc/find-header (2022-01-06) 1 commit
+ (merged to 'next' on 2022-01-10 at 8a13b4f0b3)
+ + receive-pack.c: consolidate find header logic
-* en/fetch-negotiation-default-fix (2022-02-02) 3 commits
- - repo-settings: rename the traditional default fetch.negotiationAlgorithm
- - repo-settings: fix error handling for unknown values
- - repo-settings: fix checking for fetch.negotiationAlgorithm=default
+ Code clean-up.
+ source: <pull.1125.v6.git.git.1641499655700.gitgitgadget@gmail.com>
- Fix interaction between fetch.negotiationAlgorithm and
- feature.experimental configuration variables.
- Will merge to 'next'.
- source: <pull.1131.v4.git.1643773361.gitgitgadget@gmail.com>
+* jc/mem-pool-alignment (2022-01-24) 1 commit
+ (merged to 'next' on 2022-01-26 at 057b6a78f5)
+ + mem-pool: don't assume uintmax_t is aligned enough for all types
+ Update the logic to compute alignment requirement for our mem-pool.
+ source: <20220123203347.74869-1-jrtc27@jrtc27.com>
-* en/sparse-checkout-leakfix (2022-01-28) 1 commit
- - sparse-checkout: fix a couple minor memory leaks
- Leakfix.
+* jc/name-rev-stdin (2022-01-10) 2 commits
+ (merged to 'next' on 2022-01-19 at a58e05fabe)
+ + name-rev.c: use strbuf_getline instead of limited size buffer
+ + name-rev: deprecate --stdin in favor of --annotate-stdin
- Will merge to 'next'.
- source: <pull.1189.git.git.1643335098710.gitgitgadget@gmail.com>
+ "git name-rev --stdin" does not behave like usual "--stdin" at
+ all. Start the process of renaming it to "--annotate-stdin".
+ source: <pull.1171.v7.git.git.1641425372.gitgitgadget@gmail.com>
-* js/diff-filter-negation-fix (2022-01-28) 3 commits
- - diff-filter: be more careful when looking for negative bits
- - diff.c: move the diff filter bits definitions up a bit
- - docs(diff): lose incorrect claim about `diff-files --diff-filter=A`
+* jc/qsort-s-alignment-fix (2022-01-07) 2 commits
+ (merged to 'next' on 2022-01-10 at 329fd6e09a)
+ + stable-qsort: avoid using potentially unaligned access
+ + compat/qsort_s.c: avoid using potentially unaligned access
- "git diff --diff-filter=aR" is now parsed correctly.
+ Fix a hand-rolled alloca() imitation that may have violated
+ alignment requirement of data being sorted in compatibility
+ implementation of qsort_s() and stable qsort().
+ source: <f40c1b47-9aad-2dcc-ceeb-5dee2b517cd8@web.de>
+ source: <xmqqzgo76xpj.fsf@gitster.g>
- Will merge to 'next'.
- source: <pull.1127.v3.git.1643371370.gitgitgadget@gmail.com>
+* jc/reflog-parse-options (2022-01-10) 2 commits
+ (merged to 'next' on 2022-01-12 at 1659e49c4b)
+ + builtin/reflog.c: use parse-options api for expire, delete subcommands
+ + Merge branch 'ab/reflog-prep' into jc/reflog-parse-options
-* js/no-more-legacy-stash (2022-01-27) 4 commits
- - stash: stop warning about the obsolete `stash.useBuiltin` config setting
- - stash: remove documentation for `stash.useBuiltin`
- - add: remove support for `git-legacy-stash`
- - git-sh-setup: remove remnant bits referring to `git-legacy-stash`
+ Use the parse-options API in "git reflog" command.
+ source: <pull.1175.v5.git.git.1641495981650.gitgitgadget@gmail.com>
- Removal of unused code and doc.
- Will merge to 'next'.
- source: <pull.1133.git.1643321031.gitgitgadget@gmail.com>
+* jh/p4-fix-use-of-process-error-exception (2022-01-06) 1 commit
+ (merged to 'next' on 2022-01-10 at 49d529bfd7)
+ + git-p4: fix instantiation of CalledProcessError
+ (this branch is used by jh/p4-various-fixups.)
+ source: <20220106214156.90967-1-jholdsworth@nvidia.com>
-* js/scalar-global-options (2022-01-28) 1 commit
- - scalar: accept -C and -c options before the subcommand
- Scalar update.
+* jh/p4-spawning-external-commands-cleanup (2022-01-06) 3 commits
+ (merged to 'next' on 2022-01-10 at 54b36b4e66)
+ + git-p4: don't print shell commands as python lists
+ + git-p4: pass command arguments as lists instead of using shell
+ + git-p4: don't select shell mode using the type of the command argument
+ (this branch is used by jh/p4-various-fixups.)
- Will merge to 'next'.
- source: <pull.1130.v2.git.1643380317358.gitgitgadget@gmail.com>
+ source: <20220106214035.90725-1-jholdsworth@nvidia.com>
-* rc/negotiate-only-typofix (2022-01-28) 1 commit
- - fetch: fix negotiate-only error message
+* js/sparse-vs-split-index (2022-01-23) 3 commits
+ (merged to 'next' on 2022-01-26 at 7443487955)
+ + split-index: it really is incompatible with the sparse index
+ + t1091: disable split index
+ + sparse-index: sparse index is disallowed when split index is active
- Typofix.
+ Mark in various places in the code that the sparse index and the
+ split index features are mutually incompatible.
+ source: <pull.1119.git.1642613379.gitgitgadget@gmail.com>
- Will merge to 'next'.
- source: <20220128143602.31842-1-robert@coup.net.nz>
+* js/test-unset-trace2-parents (2022-01-20) 1 commit
+ (merged to 'next' on 2022-01-20 at ebb085e3e4)
+ + test-lib: unset trace2 parent envvars
-* rj/receive-pack-abort-upon-disconnect (2022-01-28) 1 commit
- - receive-pack: check if client is alive before completing the push
+ Avoid tests that are run under GIT_TRACE2 set from failing
+ unnecessarily.
+ source: <82e51a52e20fbe13a5a898a0a2f6dbe1188e3fa3.1642116539.git.steadmon@google.com>
- "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 merge to 'next'?
- source: <20220128194811.3396281-1-robin.jarry@6wind.com>
+* jt/clone-not-quite-empty (2022-01-26) 1 commit
+ (merged to 'next' on 2022-01-26 at c3bb39676e)
+ + clone: support unusual remote ref configurations
+ Cloning from a repository that does not yet have any branches or
+ tags but has other refs resulted in a "remote transport reported
+ error", which has been corrected.
+ source: <20220124180909.2437002-1-jonathantanmy@google.com>
-* jz/patch-id-hunk-header-parsing-fix (2022-02-02) 2 commits
- - patch-id: fix scan_hunk_header on diffs with 1 line of before/after
- - patch-id: fix antipatterns in tests
- Unlike "git apply", "git patch-id" did not handle patches with
- hunks that has only 1 line in either preimage or postimage, which
- has been corrected.
+* jt/conditional-config-on-remote-url (2022-01-18) 2 commits
+ (merged to 'next' on 2022-01-19 at 3c2df266eb)
+ + config: include file if remote URL matches a glob
+ + config: make git_config_include() static
- Will merge to 'next'.
- source: <20220202041945.10077-1-jerry@skydio.com>
- source: <20220202042015.10115-1-jerry@skydio.com>
+ The conditional inclusion mechanism of configuration files using
+ "[includeIf <condition>]" learns to base its decision on the
+ URL of the remote repository the repository interacts with.
+ source: <cover.1642527965.git.jonathantanmy@google.com>
-* tg/fetch-prune-exit-code-fix (2022-01-31) 1 commit
- - fetch --prune: exit with error if pruning fails
+* jt/sparse-checkout-leading-dir-fix (2022-01-21) 1 commit
+ (merged to 'next' on 2022-01-26 at 5611ce9047)
+ + sparse-checkout: create leading directory
- When "git fetch --prune" failed to prune the refs it wanted to
- prune, the command issued error messages but exited with exit
- status 0, which has been corrected.
+ "git sparse-checkout init" failed to write into $GIT_DIR/info
+ directory when the repository was created without one, which has
+ been corrected to auto-create it.
+ source: <20220121174441.3991963-1-jonathantanmy@google.com>
- Will merge to 'next'.
- source: <20220131133047.1885074-1-t.gummerer@gmail.com>
+* ms/update-index-racy (2022-01-07) 4 commits
+ (merged to 'next' on 2022-01-14 at 705a33f63b)
+ + update-index: refresh should rewrite index in case of racy timestamps
+ + t7508: add tests capturing racy timestamp handling
+ + t7508: fix bogus mtime verification
+ + test-lib: introduce API for verifying file mtime
-* ab/do-not-hide-failures-in-git-dot-pm (2022-02-01) 1 commit
- - perl Git.pm: don't ignore signalled failure in _cmd_close()
+ "git update-index --refresh" has been taught to deal better with
+ racy timestamps (just like "git status" already does).
+ source: <pull.1105.v4.git.1641554252.gitgitgadget@gmail.com>
- Git.pm update.
- Will merge to 'next'.
- source: <patch-1.1-86353c3b366-20220201T205218Z-avarab@gmail.com>
+* pb/pull-rebase-autostash-fix (2022-01-14) 1 commit
+ (merged to 'next' on 2022-01-14 at 83a388a7e2)
+ + pull --rebase: honor rebase.autostash when fast-forwarding
+ "git pull --rebase" ignored the rebase.autostash configuration
+ variable when the remote history is a descendant of our history,
+ which has been corrected.
+ source: <xmqqr19aayxp.fsf@gitster.g>
-* ab/object-file-api-updates (2022-02-01) 10 commits
- - object-file API: pass an enum to read_object_with_reference()
- - object-file.c: add a literal version of write_object_file_prepare()
- - object-file API: replace check_object_signature() with stream_*
- - object-file API: have hash_object_file() take "enum object_type"
- - object-file API: replace some use of check_object_signature()
- - object-file API: provide a hash_object_file_oideq()
- - object-file API: have write_object_file() take "enum object_type"
- - object-file API: add a format_object_header() function
- - object-file API: return "void", not "int" from hash_object_file()
- - object-file.c: split up declaration of unrelated variables
- source: <cover-00.10-00000000000-20220201T144803Z-avarab@gmail.com>
+* po/readme-mention-contributor-hints (2022-01-17) 1 commit
+ (merged to 'next' on 2022-01-19 at 7e14690eb9)
+ + README.md: add CodingGuidelines and a link for Translators
+ Doc update.
+ source: <pull.1115.v3.git.1642443491609.gitgitgadget@gmail.com>
-* cb/clear-quarantine-early-on-all-ref-update-errors (2022-02-01) 1 commit
- - receive-pack: purge temporary data if no command is ready to run
- Check if "receive-pack" will do any ref updates (various conditions
- could reject a push) before received objects are taken out of the
- temporary directory used for quarantine purposes, so that a push
- that is known-to-fail will not leave crufts that a future "gc"
- needs to clean up.
+* pw/add-p-hunk-split-fix (2022-01-12) 2 commits
+ (merged to 'next' on 2022-01-19 at ea57b2c9a6)
+ + builtin add -p: fix hunk splitting
+ + t3701: clean up hunk splitting tests
- Will merge to 'next'?
- source: <20220129063538.24038-1-bojun.cbj@gmail.com>
+ "git add -p" rewritten in C regressed hunk splitting in some cases,
+ which has been corrected.
+ source: <pull.1100.v2.git.1641899530.gitgitgadget@gmail.com>
-* hn/reftable-tests (2022-01-31) 3 commits
- - t5312: prepare for reftable
- - t1405: mark test that checks existence as REFFILES
- - t1405: explictly delete reflogs for reftable
+* rs/apply-symlinks-use-strset (2022-01-07) 1 commit
+ (merged to 'next' on 2022-01-10 at 32497a67d5)
+ + apply: use strsets to track symlinks
- Prepare more test scripts for the introduction of reftable.
+ "git apply" (ab)used the util pointer of the string-list to keep
+ track of how each symbolic link needs to be handled, which has been
+ simplified by using strset.
+ source: <8739caad-aa3d-1f0f-b5dd-6174a8e059f6@web.de>
- Will merge to 'next'.
- source: <pull.1209.git.git.1643651420.gitgitgadget@gmail.com>
+* rs/grep-expr-cleanup (2022-01-06) 4 commits
+ (merged to 'next' on 2022-01-10 at b70a3bb0fa)
+ + grep: use grep_and_expr() in compile_pattern_and()
+ + grep: extract grep_binexp() from grep_or_expr()
+ + grep: use grep_not_expr() in compile_pattern_not()
+ + grep: use grep_or_expr() in compile_pattern_or()
-* ja/i18n-common-messages (2022-01-31) 5 commits
- - i18n: fix some misformated placeholders in command synopsis
- - i18n: remove from i18n strings that do not hold translatable parts
- - i18n: factorize "invalid value" messages
- - SQUASH???
- - i18n: factorize more 'incompatible options' messages
+ Code clean-up.
+ source: <cover.1641498525.git.me@ttaylorr.com>
- Unify more messages to help l10n.
- Will merge to 'next' after squashing the fix-up in.
- source: <pull.1123.v4.git.1643666870.gitgitgadget@gmail.com>
+* tl/doc-cli-options-first (2022-01-17) 1 commit
+ (merged to 'next' on 2022-01-19 at 9ec14cfe73)
+ + git-cli.txt: clarify "options first and then args"
+ We explain that revs come first before the pathspec among command
+ line arguments, but did not spell out that dashed options come
+ before other args, which has been corrected.
+ source: <fe748304d94e0ae25fd3549aadc49cf951ff2d64.1642405806.git.dyroneteng@gmail.com>
-* tk/subtree-merge-not-ff-only (2022-02-01) 1 commit
- - subtree: force merge commit
+--------------------------------------------------
+[New Topics]
- When "git subtree" wants to create a merge, it used "git merge" and
- let it be affected by end-user's "merge.ff" configuration, which
- has been corrected.
+* ab/t0051-skip-on-non-windows (2022-02-04) 1 commit
+ - t0051: use "skip_all" under !MINGW in single-test file
+
+ Conditional test update.
Will merge to 'next'.
- source: <20220201172601.262718-1-aclopte@gmail.com>
+ source: <patch-v2-1.1-1bc93bcba4b-20220204T134208Z-avarab@gmail.com>
-* ab/complete-show-all-commands (2022-02-02) 2 commits
- - completion: add a GIT_COMPLETION_SHOW_ALL_COMMANDS
- - completion tests: re-source git-completion.bash in a subshell
+* ab/hash-object-leakfix (2022-02-06) 1 commit
+ - hash-object: fix a trivial leak in --path
- The command line completion script (in contrib/) learns an option
- to complete all Git subcommands, including the ones that are
- normally hidden.
+ Trivial leakfix.
Will merge to 'next'.
- source: <cover-v2-0.2-00000000000-20220202T111228Z-avarab@gmail.com>
+ source: <patch-1.1-53863df1455-20220205T000422Z-avarab@gmail.com>
-* en/merge-tree (2022-02-02) 16 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: allow update messages to be written to different file stream
- - merge-ort: split out a separate display_update_messages() function
- - diff: allow diff_warn_rename_limit to write somewhere besides stderr
- - Introduce a variant of the `warning()` function that takes a `FILE *`
- - 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
- (this branch uses en/remerge-diff.)
+* ab/release-transport-ls-refs-options (2022-02-06) 1 commit
+ - ls-remote & transport API: release "struct transport_ls_refs_options"
- 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.
+ Will merge to 'next'.
+ source: <patch-1.1-e80e8f64eae-20220205T000809Z-avarab@gmail.com>
- source: <pull.1122.v3.git.1643787281.gitgitgadget@gmail.com>
+* js/bisect-in-c (2022-02-09) 11 commits
+ - bisect: no longer try to clean up left-over `.git/head-name` files
+ - bisect: remove Cogito-related code
+ - Turn `git bisect` into a full built-in.
+ - bisect--helper: using `--bisect-state` without an argument is a bug
+ - bisect: move even the option parsing to `bisect--helper`
+ - bisect--helper: make `--bisect-state` optional
+ - bisect--helper: align the sub-command order with git-bisect.sh
+ - bisect--helper: really retire `--bisect-autostart`
+ - bisect--helper: really retire --bisect-next-check
+ - bisect--helper: retire the --no-log option
+ - bisect run: fix the error message
-* ll/doc-mktree-typofix (2022-02-02) 1 commit
- - fix typo in git-mktree.txt
+ Final bits of "git bisect.sh" have been rewritten in C.
+ source: <pull.1132.git.1643328752.gitgitgadget@gmail.com>
- Typofix.
- Will merge to 'next'.
- source: <pull.1207.git.git.1643792450866.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
-* po/doc-check-ignore-markup-fix (2022-02-03) 1 commit
- - doc: check-ignore: code-quote an exclamation mark
+ source: <pull.1128.v2.git.1644187146.gitgitgadget@gmail.com>
- Typofix.
+
+* js/short-help-outside-repo-fix (2022-02-08) 2 commits
+ - t0012: verify that built-ins handle `-h` even without gitdir
+ - checkout/fetch/pull/pack-objects: allow `-h` outside a repository
+
+ "git cmd -h" outside a repository should error out cleanly for many
+ commands, but instead it hit a BUG(), which has been corrected.
Will merge to 'next'.
- source: <20220203101643.1987-1-philipoakley@iee.email>
+ source: <pull.1139.v2.git.1644319314.gitgitgadget@gmail.com>
-* sy/diff-usage-typofix (2022-02-02) 1 commit
- - builtin/diff.c: fix "git-diff" usage string typo
+* tb/midx-no-bitmap-for-no-objects (2022-02-09) 1 commit
+ - midx: prevent writing a .bitmap without any objects
- Typofix.
+ When there is no object to write .bitmap file for, "git
+ multi-pack-index" triggered an error, instead of just skipping,
+ which has been corrected.
Will merge to 'next'.
- source: <20220202072844.35545-1-shaoxuan.yuan02@gmail.com>
+ source: <abc67d757cb6b244cf54b7b030985180ce134724.1644434802.git.me@ttaylorr.com>
-* sy/modernize-t-lib-read-tree-m-3way (2022-02-02) 2 commits
- - t/lib-read-tree-m-3way: indent with tabs
- - t/lib-read-tree-m-3way: modernize style
+* jc/cat-file-batch-commands (2022-02-08) 3 commits
+ . cat-file: add --batch-command mode
+ . cat-file: introduce batch_command enum to replace print_contents
+ . cat-file: rename cmdmode to transform_mode
- Style updates on a test script helper.
- Will merge to 'next'.
- source: <20220123060318.471414-1-shaoxuan.yuan02@gmail.com>
+ Seems to make tests hang.
+ source: <pull.1212.v3.git.git.1644353884.gitgitgadget@gmail.com>
--------------------------------------------------
[Stalled]
cf. <CAPUEsphktbdxeV7hvF52Or3CVHS8oOk5-WV=xfEZa8kfCVVnVg@mail.gmail.com>
source: <20211202035446.1154-1-carenas@gmail.com>
+--------------------------------------------------
+[Cooking]
-* ar/submodule-update (2022-01-28) 9 commits
+* ar/submodule-update (2022-02-08) 16 commits
. submodule: move core cmd_update() logic to C
+ . submodule--helper: move functions around
+ . submodule--helper update-clone: learn --init
+ . submodule--helper: remove ensure-core-worktree
+ . submodule--helper run-update-procedure: learn --remote
+ . 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
. submodule--helper: don't use bitfield indirection for parse_options()
. builtin/submodule--helper.c: rename option variables to "opt"
. submodule--helper: get remote names from any repository
Rewrite of "git submodule update" in C.
- source: <cover-v5-0.9-00000000000-20220128T125206Z-avarab@gmail.com>
---------------------------------------------------
-[Cooking]
+ Does not seem to play well with other topics in flight.
+ source: <20220208083952.35036-1-chooglen@google.com>
+
+
+* pw/use-in-process-checkout-in-rebase (2022-01-26) 14 commits
+ - rebase -m: don't fork git checkout
+ - rebase --apply: set ORIG_HEAD correctly
+ - rebase --apply: fix reflog
+ - reset_head(): take struct rebase_head_opts
+ - rebase: cleanup reset_head() calls
+ - create_autostash(): remove unneeded parameter
+ - reset_head(): make default_reflog_action optional
+ - reset_head(): factor out ref updates
+ - reset_head(): remove action parameter
+ - rebase --apply: don't run post-checkout hook if there is an error
+ - rebase: do not remove untracked files on checkout
+ - rebase: pass correct arguments to post-checkout hook
+ - t5403: refactor rebase post-checkout hook tests
+ - rebase: factor out checkout for up to date branch
+
+ Use an internal call to reset_head() helper function instead of
+ spawning "git checkout" in "rebase", and update code paths that are
+ involved in the change.
+
+ Will merge to 'next'.
+ source: <pull.1049.v3.git.1643202349.gitgitgadget@gmail.com>
+
+
+* ab/no-errno-from-resolve-ref-unsafe (2022-01-26) 2 commits
+ (merged to 'next' on 2022-02-04 at d98254efe0)
+ + refs API: remove "failure_errno" from refs_resolve_ref_unsafe()
+ + sequencer: don't use die_errno() on refs_resolve_ref_unsafe() failure
+
+ Remaining code-clean-up.
+
+ Will merge to 'master'.
+ source: <cover-v4-0.2-00000000000-20220126T143427Z-avarab@gmail.com>
+
+
+* gh/doc-typos (2022-01-26) 2 commits
+ (merged to 'next' on 2022-02-04 at b71e1bc746)
+ + Documentation/config/pgp.txt: add missing apostrophe
+ + Documentation/config/pgp.txt: replace stray <TAB> character with <SPC>
+
+ Typofix.
+
+ Will merge to 'master'.
+ source: <20220126121426.53799-1-greg@hurrell.net>
+
+
+* jc/doc-log-messages (2022-01-27) 3 commits
+ (merged to 'next' on 2022-02-04 at cf136572ce)
+ + SubmittingPatches: explain why we care about log messages
+ + CodingGuidelines: hint why we value clearly written log messages
+ + SubmittingPatches: write problem statement in the log in the present tense
+
+ Update the contributor-facing documents on proposed log messages.
+
+ Will merge to 'master'.
+ source: <20220126234205.2923388-1-gitster@pobox.com>
+
+
+* en/fetch-negotiation-default-fix (2022-02-02) 3 commits
+ (merged to 'next' on 2022-02-08 at 95a8a91e97)
+ + repo-settings: rename the traditional default fetch.negotiationAlgorithm
+ + repo-settings: fix error handling for unknown values
+ + repo-settings: fix checking for fetch.negotiationAlgorithm=default
+
+ Fix interaction between fetch.negotiationAlgorithm and
+ feature.experimental configuration variables.
+
+ Will merge to 'master'.
+ source: <pull.1131.v4.git.1643773361.gitgitgadget@gmail.com>
+
+
+* en/sparse-checkout-leakfix (2022-01-28) 1 commit
+ (merged to 'next' on 2022-02-04 at 10ca176008)
+ + sparse-checkout: fix a couple minor memory leaks
+
+ Leakfix.
+
+ Will merge to 'master'.
+ source: <pull.1189.git.git.1643335098710.gitgitgadget@gmail.com>
+
+
+* js/diff-filter-negation-fix (2022-01-28) 3 commits
+ (merged to 'next' on 2022-02-08 at fe004a4c2c)
+ + diff-filter: be more careful when looking for negative bits
+ + diff.c: move the diff filter bits definitions up a bit
+ + docs(diff): lose incorrect claim about `diff-files --diff-filter=A`
+
+ "git diff --diff-filter=aR" is now parsed correctly.
+
+ Will merge to 'master'.
+ source: <f1f027ad61beb1bd0dee73acbffdee5c0f967e9a.1643371370.git.gitgitgadget@gmail.com>
-* jc/mem-pool-alignment (2022-01-24) 1 commit
- (merged to 'next' on 2022-01-26 at 057b6a78f5)
- + mem-pool: don't assume uintmax_t is aligned enough for all types
- Update the logic to compute alignment requirement for our mem-pool.
+* js/no-more-legacy-stash (2022-01-27) 4 commits
+ (merged to 'next' on 2022-02-08 at 5cecfdbd58)
+ + stash: stop warning about the obsolete `stash.useBuiltin` config setting
+ + stash: remove documentation for `stash.useBuiltin`
+ + add: remove support for `git-legacy-stash`
+ + git-sh-setup: remove remnant bits referring to `git-legacy-stash`
+
+ Removal of unused code and doc.
Will merge to 'master'.
- source: <20220123203347.74869-1-jrtc27@jrtc27.com>
+ source: <pull.1133.git.1643321031.gitgitgadget@gmail.com>
-* ab/auto-detect-zlib-compress2 (2022-01-26) 1 commit
- - compat: auto-detect if zlib has uncompress2()
+* js/scalar-global-options (2022-01-28) 1 commit
+ (merged to 'next' on 2022-02-09 at 8af744524c)
+ + scalar: accept -C and -c options before the subcommand
- Notice older zlib to enable our replacement uncompress2()
- automatically.
+ Scalar update.
- Will merge to 'next'.
- source: <xmqqr18x3s5s.fsf@gitster.g>
+ Will merge to 'master'.
+ source: <pull.1130.v2.git.1643380317358.gitgitgadget@gmail.com>
-* en/plug-leaks-in-merge (2022-01-21) 2 commits
- (merged to 'next' on 2022-01-26 at 0cf6aa0a2b)
- + merge: fix memory leaks in cmd_merge()
- + merge-ort: fix memory leak in merge_ort_internal()
+* rc/negotiate-only-typofix (2022-01-28) 1 commit
+ (merged to 'next' on 2022-02-04 at 62b947ddbf)
+ + fetch: fix negotiate-only error message
- Leakfix.
+ Typofix.
Will merge to 'master'.
- source: <pull.1200.git.git.1642664835.gitgitgadget@gmail.com>
+ source: <20220128143602.31842-1-robert@coup.net.nz>
-* js/apply-partial-clone-filters-recursively (2022-01-21) 1 commit
- - clone, submodule: pass partial clone filters to submodules
+* rj/receive-pack-abort-upon-disconnect (2022-01-28) 1 commit
+ - receive-pack: check if client is alive before completing the push
- "git clone --filter=... --recurse-submodules" only makes the
- top-level a partial clone, while submodules are fully cloned. This
- behaviour is changed to pass the same filter down to the submodules.
+ "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.
- It is unclear passing all filters down is a good idea. It
- definitely is contrary to the project norm to flip the default
- instead of starting the new behaviour as an optional behaviour.
- cf. <xmqqsftgbkvm.fsf@gitster.g>
- source: <50ebf7bd39adf34fa4ada27cd433d81b5381abe5.1642735881.git.steadmon@google.com>
+ Needs more work?
+ cf. <220204.864k5e4yvf.gmgdl@evledraar.gmail.com>
+ source: <20220128194811.3396281-1-robin.jarry@6wind.com>
-* js/sparse-vs-split-index (2022-01-23) 3 commits
- (merged to 'next' on 2022-01-26 at 7443487955)
- + split-index: it really is incompatible with the sparse index
- + t1091: disable split index
- + sparse-index: sparse index is disallowed when split index is active
+* jz/patch-id-hunk-header-parsing-fix (2022-02-02) 2 commits
+ (merged to 'next' on 2022-02-09 at 8665cb204a)
+ + patch-id: fix scan_hunk_header on diffs with 1 line of before/after
+ + patch-id: fix antipatterns in tests
- Mark in various places in the code that the sparse index and the
- split index features are mutually incompatible.
+ Unlike "git apply", "git patch-id" did not handle patches with
+ hunks that has only 1 line in either preimage or postimage, which
+ has been corrected.
Will merge to 'master'.
- source: <pull.1119.git.1642613379.gitgitgadget@gmail.com>
+ source: <20220202041945.10077-1-jerry@skydio.com>
+ source: <20220202042015.10115-1-jerry@skydio.com>
-* js/test-unset-trace2-parents (2022-01-20) 1 commit
- (merged to 'next' on 2022-01-20 at ebb085e3e4)
- + test-lib: unset trace2 parent envvars
+* tg/fetch-prune-exit-code-fix (2022-01-31) 1 commit
+ (merged to 'next' on 2022-02-04 at 8af6ab286d)
+ + fetch --prune: exit with error if pruning fails
- Avoid tests that are run under GIT_TRACE2 set from failing
- unnecessarily.
+ When "git fetch --prune" failed to prune the refs it wanted to
+ prune, the command issued error messages but exited with exit
+ status 0, which has been corrected.
Will merge to 'master'.
- source: <82e51a52e20fbe13a5a898a0a2f6dbe1188e3fa3.1642116539.git.steadmon@google.com>
+ source: <20220131133047.1885074-1-t.gummerer@gmail.com>
-* jt/sparse-checkout-leading-dir-fix (2022-01-21) 1 commit
- (merged to 'next' on 2022-01-26 at 5611ce9047)
- + sparse-checkout: create leading directory
+* ab/do-not-hide-failures-in-git-dot-pm (2022-02-01) 1 commit
+ (merged to 'next' on 2022-02-08 at 1a8001f83e)
+ + perl Git.pm: don't ignore signalled failure in _cmd_close()
- "git sparse-checkout init" failed to write into $GIT_DIR/info
- directory when the repository was created without one, which has
- been corrected to auto-create it.
+ Git.pm update.
Will merge to 'master'.
- source: <20220121174441.3991963-1-jonathantanmy@google.com>
+ source: <patch-1.1-86353c3b366-20220201T205218Z-avarab@gmail.com>
-* rs/parse-options-lithelp-help (2022-01-20) 1 commit
- - parse-options: document bracketing of argh
+* ab/object-file-api-updates (2022-02-04) 11 commits
+ - object-file API: pass an enum to read_object_with_reference()
+ - object-file.c: add a literal version of write_object_file_prepare()
+ - object-file API: have hash_object_file() take "enum object_type"
+ - object API: rename hash_object_file_literally() to write_*()
+ - object-file API: split up and simplify check_object_signature()
+ - object API: make check_object_signature() oideq()-like, move docs
+ - object API: correct "buf" v.s. "map" mismatch in *.c and *.h
+ - object-file API: have write_object_file() take "enum object_type"
+ - object-file API: add a format_object_header() function
+ - object-file API: return "void", not "int" from hash_object_file()
+ - object-file.c: split up declaration of unrelated variables
+
+ Object-file API shuffling.
+ source: <cover-v2-00.11-00000000000-20220204T135005Z-avarab@gmail.com>
- Comment update.
+
+* cb/clear-quarantine-early-on-all-ref-update-errors (2022-02-01) 1 commit
+ - receive-pack: purge temporary data if no command is ready to run
+
+ Check if "receive-pack" will do any ref updates (various conditions
+ could reject a push) before received objects are taken out of the
+ temporary directory used for quarantine purposes, so that a push
+ that is known-to-fail will not leave crufts that a future "gc"
+ needs to clean up.
Will merge to 'next'.
- source: <c6ab4408-1091-4d14-849e-afe5f3053e8b@web.de>
+ source: <20220129063538.24038-1-bojun.cbj@gmail.com>
-* en/merge-ort-restart-optim-fix (2022-01-17) 1 commit
- (merged to 'next' on 2022-01-19 at 84da10b057)
- + merge-ort: avoid assuming all renames detected
+* hn/reftable-tests (2022-01-31) 3 commits
+ (merged to 'next' on 2022-02-09 at 5e22946a1f)
+ + t5312: prepare for reftable
+ + t1405: mark test that checks existence as REFFILES
+ + t1405: explictly delete reflogs for reftable
- The merge-ort misbehaved when merge.renameLimit configuration is
- set too low and failed to find all renames.
+ Prepare more test scripts for the introduction of reftable.
Will merge to 'master'.
- source: <pull.1194.v2.git.git.1642443955836.gitgitgadget@gmail.com>
+ source: <pull.1209.git.git.1643651420.gitgitgadget@gmail.com>
-* jh/p4-various-fixups (2022-01-16) 23 commits
- . 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
- . Merge branch 'jh/p4-spawning-external-commands-cleanup' into jh/p4-various-fixups
- . Merge branch 'jh/p4-fix-use-of-process-error-exception' into jh/p4-various-fixups
- (this branch uses jh/p4-fix-use-of-process-error-exception and jh/p4-spawning-external-commands-cleanup.)
+* ja/i18n-common-messages (2022-02-04) 4 commits
+ - i18n: fix some misformated placeholders in command synopsis
+ - i18n: remove from i18n strings that do not hold translatable parts
+ - i18n: factorize "invalid value" messages
+ - i18n: factorize more 'incompatible options' messages
- Various cleanups to "git p4".
+ Unify more messages to help l10n.
- Breaks its own test suite.
- source: <20220116160550.514637-1-jholdsworth@nvidia.com>
+ Will merge to 'next'?
+ source: <pull.1123.v4.git.1643666870.gitgitgadget@gmail.com>
-* po/readme-mention-contributor-hints (2022-01-17) 1 commit
- (merged to 'next' on 2022-01-19 at 7e14690eb9)
- + README.md: add CodingGuidelines and a link for Translators
+* tk/subtree-merge-not-ff-only (2022-02-01) 1 commit
+ (merged to 'next' on 2022-02-09 at 849450010e)
+ + subtree: force merge commit
- Doc update.
+ When "git subtree" wants to create a merge, it used "git merge" and
+ let it be affected by end-user's "merge.ff" configuration, which
+ has been corrected.
Will merge to 'master'.
- source: <pull.1115.v3.git.1642443491609.gitgitgadget@gmail.com>
+ source: <20220201172601.262718-1-aclopte@gmail.com>
-* tl/doc-cli-options-first (2022-01-17) 1 commit
- (merged to 'next' on 2022-01-19 at 9ec14cfe73)
- + git-cli.txt: clarify "options first and then args"
+* ab/complete-show-all-commands (2022-02-02) 2 commits
+ (merged to 'next' on 2022-02-09 at be3b7cf4e4)
+ + completion: add a GIT_COMPLETION_SHOW_ALL_COMMANDS
+ + completion tests: re-source git-completion.bash in a subshell
- We explain that revs come first before the pathspec among command
- line arguments, but did not spell out that dashed options come
- before other args, which has been corrected.
+ The command line completion script (in contrib/) learns an option
+ to complete all Git subcommands, including the ones that are
+ normally hidden.
Will merge to 'master'.
- source: <fe748304d94e0ae25fd3549aadc49cf951ff2d64.1642405806.git.dyroneteng@gmail.com>
+ source: <cover-v2-0.2-00000000000-20220202T111228Z-avarab@gmail.com>
-* rs/bisect-executable-not-found (2022-01-19) 4 commits
- - bisect--helper: double-check run command on exit code 126 and 127
- - bisect: document run behavior with exit codes 126 and 127
- - bisect--helper: release strbuf and strvec on run error
- - bisect--helper: report actual bisect_state() argument on error
+* en/merge-tree (2022-02-02) 16 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: allow update messages to be written to different file stream
+ - merge-ort: split out a separate display_update_messages() function
+ - diff: allow diff_warn_rename_limit to write somewhere besides stderr
+ - Introduce a variant of the `warning()` function that takes a `FILE *`
+ - 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
+ (this branch uses en/remerge-diff.)
- A not-so-common mistake is to write a script to feed "git bisect
- run" without making it executable, in which case all tests will
- exit with 126 or 127 error codes, even on revisions that are marked
- as good. Try to recoginse this situation and stop iteration early.
+ 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.
+ source: <pull.1122.v3.git.1643787281.gitgitgadget@gmail.com>
- Will merge to 'next'?
- source: <fead25d6-6f5f-487a-ad4c-0657fe9785fd@www.fastmail.com>
+* ll/doc-mktree-typofix (2022-02-02) 1 commit
+ (merged to 'next' on 2022-02-08 at fe98063f1a)
+ + fix typo in git-mktree.txt
-* ds/sparse-checkout-requires-per-worktree-config (2022-01-31) 5 commits
- - worktree: copy sparse-checkout patterns and config on add
- - sparse-checkout: set worktree-config correctly
- - config: add repo_config_set_worktree_gently()
- - worktree: create init_worktree_config()
- - Documentation: add extensions.worktreeConfig details
+ Typofix.
- "git sparse-checkout" wants to work with per-worktree configration,
- but did not work well in a worktree attached to a bare repository.
+ Will merge to 'master'.
+ source: <pull.1207.git.git.1643792450866.gitgitgadget@gmail.com>
- What's the doneness of this one?
- source: <pull.1101.v5.git.1643641259.gitgitgadget@gmail.com>
+* po/doc-check-ignore-markup-fix (2022-02-03) 1 commit
+ (merged to 'next' on 2022-02-09 at 47631df376)
+ + doc: check-ignore: code-quote an exclamation mark
-* pw/add-p-hunk-split-fix (2022-01-12) 2 commits
- (merged to 'next' on 2022-01-19 at ea57b2c9a6)
- + builtin add -p: fix hunk splitting
- + t3701: clean up hunk splitting tests
+ Typofix.
- "git add -p" rewritten in C regressed hunk splitting in some cases,
- which has been corrected.
+ Will merge to 'master'.
+ source: <20220203101643.1987-1-philipoakley@iee.email>
+
+
+* sy/diff-usage-typofix (2022-02-02) 1 commit
+ (merged to 'next' on 2022-02-04 at 28a4186a44)
+ + builtin/diff.c: fix "git-diff" usage string typo
+
+ Typofix.
Will merge to 'master'.
- source: <pull.1100.v2.git.1641899530.gitgitgadget@gmail.com>
+ source: <20220202072844.35545-1-shaoxuan.yuan02@gmail.com>
-* gc/fetch-negotiate-only-early-return (2022-01-20) 4 commits
- (merged to 'next' on 2022-01-20 at e7616428eb)
- + fetch: help translators by reusing the same message template
- (merged to 'next' on 2022-01-19 at 0f15147cfa)
- + fetch --negotiate-only: do not update submodules
- + fetch: skip tasks related to fetching objects
- + fetch: use goto cleanup in cmd_fetch()
+* sy/modernize-t-lib-read-tree-m-3way (2022-02-02) 2 commits
+ (merged to 'next' on 2022-02-09 at 8b7ecb4e99)
+ + t/lib-read-tree-m-3way: indent with tabs
+ + t/lib-read-tree-m-3way: modernize style
- "git fetch --negotiate-only" is an internal command used by "git
- push" to figure out which part of our history is missing from the
- other side. It should never recurse into submodules even when
- fetch.recursesubmodules configuration variable is set, nor it
- should trigger "gc". The code has been tightened up to ensure it
- only does common ancestry discovery and nothing else.
+ Style updates on a test script helper.
Will merge to 'master'.
- source: <20220119000056.58503-1-chooglen@google.com>
+ source: <20220123060318.471414-1-shaoxuan.yuan02@gmail.com>
-* jh/p4-fix-use-of-process-error-exception (2022-01-06) 1 commit
- (merged to 'next' on 2022-01-10 at 49d529bfd7)
- + git-p4: fix instantiation of CalledProcessError
- (this branch is used by jh/p4-various-fixups.)
+* ab/auto-detect-zlib-compress2 (2022-01-26) 1 commit
+ (merged to 'next' on 2022-02-08 at 9922938a6a)
+ + compat: auto-detect if zlib has uncompress2()
+
+ Notice older zlib to enable our replacement uncompress2()
+ automatically.
Will merge to 'master'.
- source: <20220106214156.90967-1-jholdsworth@nvidia.com>
+ source: <xmqqr18x3s5s.fsf@gitster.g>
-* jh/p4-spawning-external-commands-cleanup (2022-01-06) 3 commits
- (merged to 'next' on 2022-01-10 at 54b36b4e66)
- + git-p4: don't print shell commands as python lists
- + git-p4: pass command arguments as lists instead of using shell
- + git-p4: don't select shell mode using the type of the command argument
- (this branch is used by jh/p4-various-fixups.)
+* js/apply-partial-clone-filters-recursively (2022-02-09) 1 commit
+ - clone, submodule: pass partial clone filters to submodules
+
+ "git clone --filter=... --recurse-submodules" only makes the
+ top-level a partial clone, while submodules are fully cloned. This
+ behaviour is changed to pass the same filter down to the submodules.
- Will merge to 'master'.
- source: <20220106214035.90725-1-jholdsworth@nvidia.com>
+ Will merge to 'next'?
+ source: <690d2316ad518ea4551821b2b3aa652996858475.1644034886.git.steadmon@google.com>
-* pb/pull-rebase-autostash-fix (2022-01-14) 1 commit
- (merged to 'next' on 2022-01-14 at 83a388a7e2)
- + pull --rebase: honor rebase.autostash when fast-forwarding
+* rs/parse-options-lithelp-help (2022-01-20) 1 commit
+ (merged to 'next' on 2022-02-04 at 74bc57e8fa)
+ + parse-options: document bracketing of argh
- "git pull --rebase" ignored the rebase.autostash configuration
- variable when the remote history is a descendant of our history,
- which has been corrected.
+ Comment update.
Will merge to 'master'.
- source: <xmqqr19aayxp.fsf@gitster.g>
+ source: <c6ab4408-1091-4d14-849e-afe5f3053e8b@web.de>
-* rs/grep-expr-cleanup (2022-01-06) 4 commits
- (merged to 'next' on 2022-01-10 at b70a3bb0fa)
- + grep: use grep_and_expr() in compile_pattern_and()
- + grep: extract grep_binexp() from grep_or_expr()
- + grep: use grep_not_expr() in compile_pattern_not()
- + grep: use grep_or_expr() in compile_pattern_or()
+* jh/p4-various-fixups (2022-01-16) 23 commits
+ . 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
+ . Merge branch 'jh/p4-spawning-external-commands-cleanup' into jh/p4-various-fixups
+ . Merge branch 'jh/p4-fix-use-of-process-error-exception' into jh/p4-various-fixups
- Code clean-up.
+ Various cleanups to "git p4".
- Will merge to 'master'.
- source: <cover.1641498525.git.me@ttaylorr.com>
+ Breaks its own test suite.
+ source: <20220116160550.514637-1-jholdsworth@nvidia.com>
-* fs/ssh-signing-crlf (2022-01-07) 1 commit
- (merged to 'next' on 2022-01-19 at 76b86faafb)
- + gpg-interface: trim CR from ssh-keygen
+* rs/bisect-executable-not-found (2022-01-19) 4 commits
+ - bisect--helper: double-check run command on exit code 126 and 127
+ - bisect: document run behavior with exit codes 126 and 127
+ - bisect--helper: release strbuf and strvec on run error
+ - bisect--helper: report actual bisect_state() argument on error
- The code path that verifies signatures made with ssh were made to
- work better on a system with CRLF line endings.
+ A not-so-common mistake is to write a script to feed "git bisect
+ run" without making it executable, in which case all tests will
+ exit with 126 or 127 error codes, even on revisions that are marked
+ as good. Try to recoginse this situation and stop iteration early.
- Will merge to 'master'.
- source: <20220107090735.580225-1-fs@gigacodes.de>
+ Will merge to 'next'?
+ source: <fead25d6-6f5f-487a-ad4c-0657fe9785fd@www.fastmail.com>
-* jc/qsort-s-alignment-fix (2022-01-07) 2 commits
- (merged to 'next' on 2022-01-10 at 329fd6e09a)
- + stable-qsort: avoid using potentially unaligned access
- + compat/qsort_s.c: avoid using potentially unaligned access
+* ds/sparse-checkout-requires-per-worktree-config (2022-02-08) 6 commits
+ - config: make git_configset_get_string_tmp() private
+ - worktree: copy sparse-checkout patterns and config on add
+ - sparse-checkout: set worktree-config correctly
+ - config: add repo_config_set_worktree_gently()
+ - worktree: create init_worktree_config()
+ - Documentation: add extensions.worktreeConfig details
- Fix a hand-rolled alloca() imitation that may have violated
- alignment requirement of data being sorted in compatibility
- implementation of qsort_s() and stable qsort().
+ "git sparse-checkout" wants to work with per-worktree configration,
+ but did not work well in a worktree attached to a bare repository.
- Will merge to 'master'.
- source: <f40c1b47-9aad-2dcc-ceeb-5dee2b517cd8@web.de>
- source: <xmqqzgo76xpj.fsf@gitster.g>
+ Will merge to 'next'?
+ cf. <20220204081336.3194538-1-newren@gmail.com>
+ cf. <CAPig+cRrRxuTeByhKkLs_KDaWY8-r4+jrwT83A-r+sBQsmebMw@mail.gmail.com>
+ source: <pull.1101.v6.git.1644269583.gitgitgadget@gmail.com>
* ps/avoid-unnecessary-hook-invocation-with-packed-refs (2022-01-17) 6 commits
that logically removes one ref may end up invoking ref-transaction
hook twice, which has been corrected.
- Will merge to 'next'?
+ Will merge to 'next'.
source: <cover.1642406989.git.ps@pks.im>
-* rs/apply-symlinks-use-strset (2022-01-07) 1 commit
- (merged to 'next' on 2022-01-10 at 32497a67d5)
- + apply: use strsets to track symlinks
-
- "git apply" (ab)used the util pointer of the string-list to keep
- track of how each symbolic link needs to be handled, which has been
- simplified by using strset.
-
- Will merge to 'master'.
- source: <8739caad-aa3d-1f0f-b5dd-6174a8e059f6@web.de>
-
-
-* ld/sparse-index-bash-completion (2022-02-03) 3 commits
- . completion: handle unusual characters for sparse-checkout
- . completion: improve sparse-checkout cone mode directory completion
- . completion: address sparse-checkout issues
+* ld/sparse-index-bash-completion (2022-02-08) 3 commits
+ (merged to 'next' on 2022-02-08 at ac1e968ab8)
+ + completion: handle unusual characters for sparse-checkout
+ + completion: improve sparse-checkout cone mode directory completion
+ + completion: address sparse-checkout issues
The command line completion (in contrib/) learns to complete
arguments give to "git sparse-checkout" command.
- Seems to break CI.
- source: <pull.1108.v5.git.1643921091.gitgitgadget@gmail.com>
+ Will merge to 'master'.
+ source: <pull.1108.v7.git.1644255105.gitgitgadget@gmail.com>
* bc/clarify-eol-attr (2022-01-12) 2 commits
- - docs: correct documentation about eol attribute
- - t0027: add tests for eol without text in .gitattributes
+ (merged to 'next' on 2022-02-04 at dc1db4bd21)
+ + docs: correct documentation about eol attribute
+ + t0027: add tests for eol without text in .gitattributes
Doc and test update around the eol attribute.
- Will merge to 'next'.
+ Will merge to 'master'.
source: <20220111021507.531736-1-sandals@crustytoothpaste.net>
* jz/rev-list-exclude-first-parent-only (2022-01-12) 1 commit
- - git-rev-list: add --exclude-first-parent-only flag
+ (merged to 'next' on 2022-02-09 at f26a82c66a)
+ + git-rev-list: add --exclude-first-parent-only flag
"git log" and friends learned an option --exclude-first-parent-only
to propagate UNINTERESTING bit down only along the first-parent
chain, just like --first-parent option shows commits that lack the
UNINTERESTING bit only along the first-parent chain.
- Will merge to 'next'.
+ Will merge to 'master'.
source: <20220111213941.30129-1-jerry@skydio.com>
of such files has been added to avoid these problems.
Will merge to 'next'?
+ cf. <20220204081336.3194538-1-newren@gmail.com>
source: <pull.1114.v2.git.1642175983.gitgitgadget@gmail.com>
* bc/csprng-mktemps (2022-01-17) 2 commits
- - wrapper: use a CSPRNG to generate random file names
- - wrapper: add a helper to generate numbers from a CSPRNG
+ (merged to 'next' on 2022-02-04 at 2e32375c73)
+ + wrapper: use a CSPRNG to generate random file names
+ + wrapper: add a helper to generate numbers from a CSPRNG
Pick a better random number generator and use it when we prepare
temporary filenames.
- Will merge to 'next'?
- Are we solving the right problem?
- cf. <220118.86zgntpegy.gmgdl@evledraar.gmail.com>
- source: <20220117215617.843190-1-sandals@crustytoothpaste.net>
-
-
-* jc/reflog-parse-options (2022-01-10) 2 commits
- (merged to 'next' on 2022-01-12 at 1659e49c4b)
- + builtin/reflog.c: use parse-options api for expire, delete subcommands
- + Merge branch 'ab/reflog-prep' into jc/reflog-parse-options
-
- Use the parse-options API in "git reflog" command.
-
Will merge to 'master'.
- source: <pull.1175.v5.git.git.1641495981650.gitgitgadget@gmail.com>
+ source: <20220117215617.843190-1-sandals@crustytoothpaste.net>
* vd/sparse-clean-etc (2022-01-13) 9 commits
- - update-index: reduce scope of index expansion in do_reupdate
- - update-index: integrate with sparse index
- - update-index: add tests for sparse-checkout compatibility
- - checkout-index: integrate with sparse index
- - checkout-index: add --ignore-skip-worktree-bits option
- - checkout-index: expand sparse checkout compatibility tests
- - clean: integrate with sparse index
- - reset: reorder wildcard pathspec conditions
- - reset: fix validation in sparse index test
+ (merged to 'next' on 2022-02-09 at 5928dbd25e)
+ + update-index: reduce scope of index expansion in do_reupdate
+ + update-index: integrate with sparse index
+ + update-index: add tests for sparse-checkout compatibility
+ + checkout-index: integrate with sparse index
+ + checkout-index: add --ignore-skip-worktree-bits option
+ + checkout-index: expand sparse checkout compatibility tests
+ + clean: integrate with sparse index
+ + reset: reorder wildcard pathspec conditions
+ + reset: fix validation in sparse index test
(this branch is used by en/present-despite-skipped.)
"git update-index", "git checkout-index", and "git clean" are
taught to work better with the sparse checkout feature.
- Will merge to 'next'.
- source: <pull.1109.v2.git.1641924306.gitgitgadget@gmail.com>
-
-
-* ms/update-index-racy (2022-01-07) 4 commits
- (merged to 'next' on 2022-01-14 at 705a33f63b)
- + update-index: refresh should rewrite index in case of racy timestamps
- + t7508: add tests capturing racy timestamp handling
- + t7508: fix bogus mtime verification
- + test-lib: introduce API for verifying file mtime
-
- "git update-index --refresh" has been taught to deal better with
- racy timestamps (just like "git status" already does).
-
- Will merge to 'master'.
- source: <pull.1105.v4.git.1641554252.gitgitgadget@gmail.com>
-
-
-* jc/find-header (2022-01-06) 1 commit
- (merged to 'next' on 2022-01-10 at 8a13b4f0b3)
- + receive-pack.c: consolidate find header logic
-
- Code clean-up.
-
- Will merge to 'master'.
- source: <pull.1125.v6.git.git.1641499655700.gitgitgadget@gmail.com>
-
-
-* jc/name-rev-stdin (2022-01-10) 2 commits
- (merged to 'next' on 2022-01-19 at a58e05fabe)
- + name-rev.c: use strbuf_getline instead of limited size buffer
- + name-rev: deprecate --stdin in favor of --annotate-stdin
-
- "git name-rev --stdin" does not behave like usual "--stdin" at
- all. Start the process of renaming it to "--annotate-stdin".
-
Will merge to 'master'.
- source: <pull.1171.v7.git.git.1641425372.gitgitgadget@gmail.com>
+ source: <pull.1109.v2.git.1641924306.gitgitgadget@gmail.com>
* en/remerge-diff (2022-02-02) 11 commits
- - diff-merges: avoid history simplifications when diffing merges
- - merge-ort: mark conflict/warning messages from inner merges as omittable
- - show, log: include conflict/warning messages in --remerge-diff headers
- - diff: add ability to insert additional headers for paths
- - merge-ort: format messages slightly different for use in headers
- - merge-ort: mark a few more conflict messages as omittable
- - merge-ort: capture and print ll-merge warnings in our preferred fashion
- - ll-merge: make callers responsible for showing warnings
- - log: clean unneeded objects during `log --remerge-diff`
- - show, log: provide a --remerge-diff capability
- - Merge branch 'ns/tmp-objdir' into en/remerge-diff
+ (merged to 'next' on 2022-02-08 at 68b9a8a38b)
+ + diff-merges: avoid history simplifications when diffing merges
+ + merge-ort: mark conflict/warning messages from inner merges as omittable
+ + show, log: include conflict/warning messages in --remerge-diff headers
+ + diff: add ability to insert additional headers for paths
+ + merge-ort: format messages slightly different for use in headers
+ + merge-ort: mark a few more conflict messages as omittable
+ + merge-ort: capture and print ll-merge warnings in our preferred fashion
+ + ll-merge: make callers responsible for showing warnings
+ + log: clean unneeded objects during `log --remerge-diff`
+ + show, log: provide a --remerge-diff capability
+ + Merge branch 'ns/tmp-objdir' into en/remerge-diff
(this branch is used by en/merge-tree.)
"git log --remerge-diff" shows the difference from mechanical merge
result and the merge result that is actually recorded.
- Will merge to 'next'?
+ Will merge to 'master'.
source: <pull.1103.v5.git.1643769457.gitgitgadget@gmail.com>
source: <20211222075805.19027-1-bagasdotme@gmail.com>
-* gc/branch-recurse-submodules (2022-02-01) 7 commits
+* gc/branch-recurse-submodules (2022-02-04) 7 commits
- branch.c: use 'goto cleanup' in setup_tracking() to fix memory leaks
- branch: add --recurse-submodules option for branch creation
- builtin/branch: consolidate action-picking logic in cmd_branch()
* hn/reftable-coverity-fixes (2022-01-20) 17 commits
- - reftable: add print functions to the record types
- - reftable: make reftable_record a tagged union
- - reftable: remove outdated file reftable.c
- - reftable: implement record equality generically
- - reftable: make reftable-record.h function signatures const correct
- - reftable: handle null refnames in reftable_ref_record_equal
- - reftable: drop stray printf in readwrite_test
- - reftable: order unittests by complexity
- - reftable: all xxx_free() functions accept NULL arguments
- - reftable: fix resource warning
- - reftable: ignore remove() return value in stack_test.c
- - reftable: check reftable_stack_auto_compact() return value
- - reftable: fix resource leak blocksource.c
- - reftable: fix resource leak in block.c error path
- - reftable: fix OOB stack write in print functions
- - Merge branch 'hn/create-reflog-simplify' into hn/reftable-coverity-fixes
- - Merge branch 'hn/reftable' into hn/reftable-coverity-fixes
+ (merged to 'next' on 2022-02-08 at 1baf327a66)
+ + reftable: add print functions to the record types
+ + reftable: make reftable_record a tagged union
+ + reftable: remove outdated file reftable.c
+ + reftable: implement record equality generically
+ + reftable: make reftable-record.h function signatures const correct
+ + reftable: handle null refnames in reftable_ref_record_equal
+ + reftable: drop stray printf in readwrite_test
+ + reftable: order unittests by complexity
+ + reftable: all xxx_free() functions accept NULL arguments
+ + reftable: fix resource warning
+ + reftable: ignore remove() return value in stack_test.c
+ + reftable: check reftable_stack_auto_compact() return value
+ + reftable: fix resource leak blocksource.c
+ + reftable: fix resource leak in block.c error path
+ + reftable: fix OOB stack write in print functions
+ + Merge branch 'hn/create-reflog-simplify' into hn/reftable-coverity-fixes
+ + Merge branch 'hn/reftable' into hn/reftable-coverity-fixes
Problems identified by Coverity in the reftable code have been
corrected.
- Will merge to 'next'.
+ Will merge to 'master'.
source: <pull.1152.v6.git.git.1642691534.gitgitgadget@gmail.com>
* tb/midx-bitmap-corruption-fix (2022-01-27) 9 commits
- - pack-bitmap.c: gracefully fallback after opening pack/MIDX
- - midx: read `RIDX` chunk when present
- - t/lib-bitmap.sh: parameterize tests over reverse index source
- - t5326: move tests to t/lib-bitmap.sh
- - t5326: extract `test_rev_exists`
- - t5326: drop unnecessary setup
- - pack-revindex.c: instrument loading on-disk reverse index
- - midx.c: make changing the preferred pack safe
- - t5326: demonstrate bitmap corruption after permutation
+ (merged to 'next' on 2022-02-08 at a8cc333d78)
+ + pack-bitmap.c: gracefully fallback after opening pack/MIDX
+ + midx: read `RIDX` chunk when present
+ + t/lib-bitmap.sh: parameterize tests over reverse index source
+ + t5326: move tests to t/lib-bitmap.sh
+ + t5326: extract `test_rev_exists`
+ + t5326: drop unnecessary setup
+ + pack-revindex.c: instrument loading on-disk reverse index
+ + midx.c: make changing the preferred pack safe
+ + t5326: demonstrate bitmap corruption after permutation
A bug that made multi-pack bitmap and the object order out-of-sync
(hence the .midx data gets corrupted) has been fixed.
- Will merge to 'next'.
- source: <cover.1643150456.git.me@ttaylorr.com>
-
-
-* pw/fix-some-issues-in-reset-head (2022-01-26) 14 commits
- - rebase -m: don't fork git checkout
- - rebase --apply: set ORIG_HEAD correctly
- - rebase --apply: fix reflog
- - reset_head(): take struct rebase_head_opts
- - rebase: cleanup reset_head() calls
- - create_autostash(): remove unneeded parameter
- - reset_head(): make default_reflog_action optional
- - reset_head(): factor out ref updates
- - reset_head(): remove action parameter
- - rebase --apply: don't run post-checkout hook if there is an error
- - rebase: do not remove untracked files on checkout
- - rebase: pass correct arguments to post-checkout hook
- - t5403: refactor rebase post-checkout hook tests
- - rebase: factor out checkout for up to date branch
-
- Use an internal call to reset_head() helper function instead of
- spawning "git checkout" in "rebase", and update code paths that are
- involved in the change.
-
- Will merge to 'next'?
- May want to rename the topic branch to "pw/use-in-process-checkout-in-rebase"
- or something before doing so.
- source: <pull.1049.v3.git.1643202349.gitgitgadget@gmail.com>
-
-
-* ab/cat-file (2022-01-12) 12 commits
- (merged to 'next' on 2022-01-12 at ee4d43041d)
- + cat-file: s/_/-/ in typo'd usage_msg_optf() message
- + cat-file: don't whitespace-pad "(...)" in SYNOPSIS and usage output
- (merged to 'next' on 2022-01-05 at e145efa605)
- + cat-file: use GET_OID_ONLY_TO_DIE in --(textconv|filters)
- + object-name.c: don't have GET_OID_ONLY_TO_DIE imply *_QUIETLY
- + cat-file: correct and improve usage information
- + cat-file: fix remaining usage bugs
- + cat-file: make --batch-all-objects a CMDMODE
- + cat-file: move "usage" variable to cmd_cat_file()
- + cat-file docs: fix SYNOPSIS and "-h" output
- + parse-options API: add a usage_msg_optf()
- + cat-file tests: test messaging on bad objects/paths
- + cat-file tests: test bad usage
-
- Assorted updates to "git cat-file", especially "-h".
-
Will merge to 'master'.
- source: <cover-v6-00.10-00000000000-20211228T132637Z-avarab@gmail.com>
- source: <cover-0.2-00000000000-20220110T220553Z-avarab@gmail.com>
+ source: <cover.1643150456.git.me@ttaylorr.com>
-* ab/grep-patterntype (2022-01-27) 10 commits
- - SQUASH???
+* ab/grep-patterntype (2022-02-04) 9 commits
- grep: simplify config parsing and option parsing
- grep.c: do "if (bool && memchr())" not "if (memchr() && bool)"
- grep.h: make "grep_opt.pattern_type_option" use its enum
Looking good, except for the last step.
Code-wise, it is tempted to call it a victory after squashing the
fix-up in, but that does not fix the proposed log message, so...
- source: <cover-v9-0.9-00000000000-20220127T115058Z-avarab@gmail.com>
+
+ Expecting a reroll to update its tests, but otherwise looks ready.
+ cf. <xmqqv8xui5ah.fsf@gitster.g>
+ cf. <xmqqmtj6jkuk.fsf@gitster.g>
+ source: <cover-v10-0.9-00000000000-20220204T211534Z-avarab@gmail.com>
* js/use-builtin-add-i (2021-12-01) 2 commits
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>
-* jt/conditional-config-on-remote-url (2022-01-18) 2 commits
- (merged to 'next' on 2022-01-19 at 3c2df266eb)
- + config: include file if remote URL matches a glob
- + config: make git_config_include() static
-
- The conditional inclusion mechanism of configuration files using
- "[includeIf <condition>]" learns to base its decision on the
- URL of the remote repository the repository interacts with.
-
- Will merge to 'master'.
- source: <cover.1642527965.git.jonathantanmy@google.com>
-
-
* ab/ambiguous-object-name (2022-01-27) 7 commits
- object-name: re-use "struct strbuf" in show_ambiguous_object()
- object-name: iterate ambiguous objects before showing header
Error output given in response to an ambiguous object name has been
improved.
- What's the doneness of this thing?
+ Will merge to 'next'?
source: <cover-v8-0.7-00000000000-20220127T052116Z-avarab@gmail.com>
-* tl/ls-tree-oid-only (2022-01-13) 9 commits
+* tl/ls-tree-oid-only (2022-02-08) 13 commits
+ - ls-tree.c: support --object-only option for "git-ls-tree"
+ - ls-tree: introduce function "fast_path()"
- ls-tree.c: introduce "--format" option
- cocci: allow padding with `strbuf_addf()`
- - ls-tree.c: introduce struct "show_tree_data"
- - ls-tree.c: support --object-only option for "git-ls-tree"
- - ls-tree: optimize naming and handling of "return" in show_tree()
+ - 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
"git ls-tree" learns "--oid-only" option, similar to "--name-only",
and more generalized "--format" option.
-
- Will merge to 'next'?
- source: <cover.1641978175.git.dyroneteng@gmail.com>
-
-
-* ab/config-based-hooks-2 (2022-01-07) 17 commits
- (merged to 'next' on 2022-01-19 at 594b6da22c)
- + run-command: remove old run_hook_{le,ve}() hook API
- + receive-pack: convert push-to-checkout hook to hook.h
- + read-cache: convert post-index-change to use hook.h
- + commit: convert {pre-commit,prepare-commit-msg} hook to hook.h
- + git-p4: use 'git hook' to run hooks
- + send-email: use 'git hook run' for 'sendemail-validate'
- + git hook run: add an --ignore-missing flag
- + hooks: convert worktree 'post-checkout' hook to hook library
- + hooks: convert non-worktree 'post-checkout' hook to hook library
- + merge: convert post-merge to use hook.h
- + am: convert applypatch-msg to use hook.h
- + rebase: convert pre-rebase to use hook.h
- + hook API: add a run_hooks_l() wrapper
- + am: convert {pre,post}-applypatch to use hook.h
- + gc: use hook library for pre-auto-gc hook
- + hook API: add a run_hooks() wrapper
- + hook: add 'run' subcommand
-
- More "config-based hooks".
-
- Will merge to 'master'.
- source: <cover-v6-00.17-00000000000-20211222T035755Z-avarab@gmail.com>
+ source: <cover.1644319434.git.dyroneteng@gmail.com>
* jh/builtin-fsmonitor-part2 (2021-12-25) 31 commits
source: <pull.1041.v4.git.1634826309.gitgitgadget@gmail.com>
-* es/superproject-aware-submodules (2021-11-18) 5 commits
- - submodule: use config to find superproject worktree
+* es/superproject-aware-submodules (2022-02-03) 4 commits
- submodule: record superproject gitdir during 'update'
- submodule: record superproject gitdir during absorbgitdirs
- introduce submodule.superprojectGitDir record
A configuration variable in a submodule points at the location of
the superproject it is bound to (RFC).
-
- Expecting a reroll.
- cf. <20211117234300.2598132-1-jonathantanmy@google.com>
- source: <20211117005701.371808-1-emilyshaffer@google.com>
+ source: <20220203215914.683922-1-emilyshaffer@google.com>
-* ab/only-single-progress-at-once (2022-01-07) 7 commits
- - *.c: use isatty(0|2), not isatty(STDIN_FILENO|STDERR_FILENO)
+* ab/only-single-progress-at-once (2022-02-03) 9 commits
- pack-bitmap-write.c: don't return without stop_progress()
- - progress.c: add temporary variable from progress struct
+ - progress API: unify stop_progress{,_msg}(), fix trace2 bug
+ - progress.c: refactor stop_progress{,_msg}() to use helpers
+ - progress.c: use dereferenced "progress" variable, not "(*p_progress)"
+ - progress.h: format and be consistent with progress.c naming
- progress.c tests: test some invalid usage
- progress.c tests: make start/stop commands on stdin
- progress.c test helper: add missing braces
Further tweaks on progress API.
- Getting there.
- source: <cover-v8-0.7-00000000000-20211228T150728Z-avarab@gmail.com>
+ Will merge to 'next'?
+ source: <cover-v9-0.9-00000000000-20220203T213350Z-avarab@gmail.com>
projects / thirdparty / git.git / commitdiff
