Skip to contentSkip to conversation

What's cooking in git.git (Jan 2023, #03; Mon, 9)

DISCUSSION Junio C Hamano 4 participants 4 messages Jan 9, 2023 – Jan 12, 2023

lore
Share & tools
lore
#0 lore raw

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', and aren't considered "accepted" at all. A topic without enough support may be discarded after a long period of no activity.

A handful of topics have graduated to 'master'. On 'seen', there are many topics accumulated that need reviews and review responses. I'll be offline for a few days and will reappear later this week.

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']

* cw/ci-whitespace (2022-12-20) 3 commits (merged to 'next' on 2023-01-05 at d3dc35f08c)
+ ci (check-whitespace): move to actions/checkout@v3
+ ci (check-whitespace): add links to job output
+ ci (check-whitespace): suggest fixes for errors

CI updates. We probably want a clean-up to move the long shell script embedded in yaml file into a separate file, but that can come later.
source: <[email protected]>

* js/ci-disable-cmake-by-default (2022-12-20) 1 commit (merged to 'next' on 2023-01-02 at 3f014ca5d1)
+ ci: only run win+VS build & tests in Git for Windows' fork

Stop running win+VS build by default.
source: <[email protected]>

* js/drop-mingw-test-cmp (2022-12-13) 1 commit
(merged to 'next' on 2023-01-02 at 402866b048)
+ tests(mingw): avoid very slow mingw_test_cmp

Use git diff --no-index as a test_cmp on Windows.

We'd probably need to revisit "do we really want to, and have to,
lose CRLF vs LF?" later, at which time we may be able to further
clean this up by replacing "git diff --no-index" with "diff -u".
source: <6a80fab7e3936ec56e1583d6136d47487327e907.1670339267.git.gitgitgadget@gmail.com>

--------------------------------------------------
[New Topics]

* ar/dup-words-fixes (2023-01-08) 1 commit
(merged to 'next' on 2023-01-09 at 2a5d4537a2)
+ *: fix typos which duplicate a word

Typofixes.

Will merge to 'master'.
source: <[email protected]>

* ds/bundle-uri-5 (2023-01-07) 8 commits
- bundle-uri: store fetch.bundleCreationToken
- fetch: fetch from an external bundle URI
- bundle-uri: drop bundle.flag from design doc
- clone: set fetch.bundleURI if appropriate
- bundle-uri: download in creationToken order
- bundle-uri: parse bundle.<id>.creationToken values
- bundle-uri: parse bundle.heuristic=creationToken
- t5558: add tests for creationToken heuristic (this branch uses ds/bundle-uri-4.)

The bundle-URI subsystem adds support for creation-token heuristics to help incremental fetches.

Needs review.
source: <[email protected]>

* jk/read-object-cleanup (2023-01-08) 5 commits
(merged to 'next' on 2023-01-09 at 19cc3de33e)
+ packfile: inline custom read_object()
+ repo_read_object_file(): stop wrapping read_object_file_extended()
+ read_object_file_extended(): drop lookup_replace option
+ streaming: inline call to read_object_file_extended()
+ object-file: inline calls to read_object()

Code clean-up.

Will merge to 'master'.
source: <[email protected]>

* jk/strncmp-to-api-funcs (2023-01-08) 2 commits (merged to 'next' on 2023-01-09 at 47395b7c6f)
+ convert trivial uses of strncmp() to skip_prefix()
+ convert trivial uses of strncmp() to starts_with()

Code clean-up.

Will merge to 'master'.
source: <[email protected]>

* pb/doc-orig-head (2023-01-08) 5 commits
- git-rebase.txt: add a note about 'ORIG_HEAD' being overwritten
- revisions.txt: be explicit about commands writing 'ORIG_HEAD'
- git-merge.txt: mention 'ORIG_HEAD' in the Description
- git-reset.txt: mention 'ORIG_HEAD' in the Description
- git-cherry-pick.txt: do not use 'ORIG_HEAD' in example

Document ORIG_HEAD a bit more.

Will merge to 'next'?
source: <[email protected]>

* tc/cat-file-z-use-cquote (2023-01-08) 1 commit . cat-file: quote-format name in error when using -z

"cat-file" in the batch mode that is fed NUL-terminated pathnames learned to cquote them in its error output (otherwise, a funny pathname with LF in it would break the lines in the output stream).

Breaks t1006.

 cf. https://github.com/git/git/actions/runs/3865911497/jobs/6589699288#step:6:1802
 source: <[email protected]>

* cb/grep-pcre-ucp (2023-01-09) 1 commit
- grep: correctly identify utf-8 characters with \{b,w} in -P

"grep -P" learned to use Unicode Character Property to grok character classes when processing \b and \w etc.

Will merge to 'next'?
source: <[email protected]>

* es/hooks-and-local-env (2023-01-09) 1 commit
- githooks: discuss Git operations in foreign repositories

Doc update for environment variables set when hooks are invoked.

Will merge to 'next'?
source: <[email protected]>

* ph/parse-date-reduced-precision (2023-01-09) 1 commit . date.c: allow ISO 8601 reduced precision times

Loosen date parsing heuristics.

Seems to break many tests.
source: <[email protected]>

--------------------------------------------------
[Stalled]

* tl/notes--blankline (2022-11-09) 5 commits
- notes.c: introduce "--no-blank-line" option
- notes.c: provide tips when target and append note are both empty
- notes.c: drop unreachable code in 'append_edit()'
- notes.c: cleanup for "designated init" and "char ptr init"
- notes.c: cleanup 'strbuf_grow' call in 'append_edit'

'git notes append' was taught '--[no-]blank-line' to conditionally add a LF between a new and existing note.

Expecting a reroll.
cf. <CAPig+cRcezSp4Rqt1Y9bD-FT6+7b0g9qHfbGRx65AOnw2FQXKg@mail.gmail.com>
source: <[email protected]>

* po/pretty-hard-trunc (2022-11-13) 1 commit
- pretty-formats: add hard truncation, without ellipsis, options

Add a new pretty format which truncates without ellipsis.

Expecting a reroll.
cf. <[email protected]>
source: <[email protected]>

* mc/switch-advice (2022-11-09) 1 commit
- po: use switch over checkout in error message

Use 'switch' instead of 'checkout' in an error message.

Waiting for review response.
source: <[email protected]>

* js/range-diff-mbox (2022-11-23) 1 commit
- range-diff: support reading mbox files

'git range-diff' gained support for reading either side from an .mbox file instead of a revision range.

Waiting for review response.
cf. <[email protected]>
source: <[email protected]>

* ab/tag-object-type-errors (2022-11-22) 5 commits
- tag: don't emit potentially incorrect "object is a X, not a Y"
- tag: don't misreport type of tagged objects in errors
- object tests: add test for unexpected objects in tags
- object-file.c: free the "t.tag" in check_tag()
- Merge branch 'jk/parse-object-type-mismatch' into ab/tag-object-type-errors

Hardening checks around mismatched object types when one of those objects is a tag.

Expecting a reroll.
cf. <[email protected]>
cf. <[email protected]>
source: <[email protected]>

* ab/config-multi-and-nonbool (2022-11-27) 9 commits
- for-each-repo: with bad config, don't conflate <path> and <cmd>
- config API: add "string" version of *_value_multi(), fix segfaults
- config API users: test for *_get_value_multi() segfaults
- for-each-repo: error on bad --config
- config API: have *_multi() return an "int" and take a "dest"
- versioncmp.c: refactor config reading next commit
- config tests: add "NULL" tests for *_get_value_multi()
- config tests: cover blind spots in git_die_config() tests
- for-each-repo tests: test bad --config keys

Assorted config API updates.

Needs review.
source: <[email protected]>

* ed/fsmonitor-inotify (2022-12-13) 6 commits
- fsmonitor: update doc for Linux
- fsmonitor: test updates
- fsmonitor: enable fsmonitor for Linux
- fsmonitor: implement filesystem change listener for Linux
- fsmonitor: determine if filesystem is local or remote
- fsmonitor: prepare to share code between Mac OS and Linux

Bundled fsmonitor for Linux using inotify API.

Needs review on the updated round.
source: <[email protected]>

* jc/spell-id-in-both-caps-in-message-id (2022-12-17) 1 commit
- e-mail workflow: Message-ID is spelled with ID in both capital letters

Consistently spell "Message-ID" as such, not "Message-Id".

Needs review.
source: <[email protected]>

* cb/grep-fallback-failing-jit (2022-12-17) 1 commit
- grep: fall back to interpreter mode if JIT fails

In an environment where dynamically generated code is prohibited to run (e.g. SELinux), failure to JIT pcre patterns is expected. Fall back to interpreted execution in such a case.

Expecting a reroll.
cf. <[email protected]>
source: <[email protected]>

* ad/test-record-count-when-harness-is-in-use (2022-12-25) 1 commit
- test-lib: allow storing counts with test harnesses

Allow summary results from tests to be written to t/test-results directory even when a test harness like 'prove' is in use.

Needs review.
source: <[email protected]>

* so/diff-merges-more (2022-12-18) 5 commits
- diff-merges: improve --diff-merges documentation
- diff-merges: issue warning on lone '-m' option
- diff-merges: support list of values for --diff-merges
- diff-merges: implement log.diffMerges-m-imply-p config
- diff-merges: implement [no-]hide option and log.diffMergesHide config

Assorted updates to "--diff-merges=X" option.

May want to discard. Breaking compatibility does not seem worth it.
source: <[email protected]>

--------------------------------------------------
[Cooking]

* pw/ci-print-failure-name-fix (2023-01-04) 1 commit (merged to 'next' on 2023-01-08 at 8bb55c12c7)
+ ci(github): restore "print test failures" step name

(cosmetic) CI regression fix.

Will merge to 'master'.
source: <[email protected]>

* rs/use-enhanced-bre-on-macos (2023-01-08) 1 commit
- use enhanced basic regular expressions on macOS

Newer regex library macOS stopped enabling GNU-like enhanced BRE, where '\(A\|B\)' works as alternation, unless explicitly asked with the REG_ENHANCED flag. "git grep" now can be compiled to do so, to retain the old behaviour.

Under discussion.
cf. <[email protected]>
source: <[email protected]>

* cw/submodule-status-in-parallel (2023-01-05) 6 commits
- submodule: call parallel code from serial status
- diff-lib: parallelize run_diff_files for submodules
- diff-lib: refactor match_stat_with_submodule
- submodule: move status parsing into function
- submodule: strbuf variable rename
- run-command: add duplicate_output_fn to run_processes_parallel_opts

"git submodule status" learned to run the comparison in submodule repositories in parallel.

Needs review.
source: <https://lore.kernel.org/git/[email protected]/>

* kn/attr-from-tree (2023-01-04) 3 commits
- SQUASH???
- attr: add flag --source to work with tree-ish
- t0003: move setup for --all into new block

Expecting a reroll.
cf. <CAOLa=ZStKKgyaHGjGVpQ5jsSpkdqXuH2RhvWOgrU2qKxGbQFGA@mail.gmail.com>
source: <[email protected]>

* ws/single-file-cone (2023-01-05) 1 commit
(merged to 'next' on 2023-01-09 at b6d4d7b905)
+ dir: check for single file cone patterns

The logic to see if we are using the "cone" mode by checking the sparsity patterns has been tightened to avoid mistaking a pattern that names a single file as specifying a cone.

Will merge to 'master'.
source: <[email protected]>

* ds/bundle-uri-4 (2023-01-06) 1 commit
(merged to 'next' on 2023-01-08 at d5b03bdd48)
+ test-bundle-uri: drop unused variables
(this branch is used by ds/bundle-uri-5.)

Code clean-up.

Will merge to 'master'.
source: <[email protected]>

* jk/ext-diff-with-relative (2023-01-06) 3 commits (merged to 'next' on 2023-01-08 at 5233a7d3ee)
+ diff: drop "name" parameter from prepare_temp_file()
+ diff: clean up external-diff argv setup
+ diff: use filespec path to set up tempfiles for ext-diff

"git diff --relative" did not mix well with "git diff --ext-diff", which has been corrected.

Will merge to 'master'.
source: <Y7f/[email protected]>

* tb/ci-concurrency (2022-11-08) 1 commit
(merged to 'next' on 2023-01-08 at ab7cdc20b8)
+ ci: avoid unnecessary builds

Avoid unnecessary builds in CI, with settings configured in ci-config.

Will merge to 'master'.
source: <ff172f1de982f6f79b598e4ac6d5b2964ca4a098.1667931937.git.me@ttaylorr.com>

* tr/am--no-verify (2023-01-05) 1 commit
(merged to 'next' on 2023-01-08 at 4585013067)
+ am: allow passing --no-verify flag

Conditionally skip the pre-applypatch and applypatch-msg hooks when applying patches with 'git am'.

Will merge to 'master'.
source: <[email protected]>

* ab/various-leak-fixes (2022-12-30) 20 commits
- push: free_refs() the "local_refs" in set_refspecs()
- receive-pack: free() the "ref_name" in "struct command"
- grep API: plug memory leaks by freeing "header_list"
- grep.c: refactor free_grep_patterns()
- object-file.c: release the "tag" in check_tag()
- connected.c: free(new_pack) in check_connected()
- builtin/merge.c: free "&buf" on "Your local changes..." error
- builtin/merge.c: always free "struct strbuf msg"
- show-branch: free() allocated "head" before return
- commit-graph: fix a parse_options_concat() leak
- http-backend.c: fix cmd_main() memory leak, refactor reg{exec,free}()
- http-backend.c: fix "dir" and "cmd_arg" leaks in cmd_main()
- worktree: fix a trivial leak in prune_worktrees()
- repack: fix leaks on error with "goto cleanup"
- name-rev: don't xstrdup() an already dup'd string
- various: add missing clear_pathspec(), fix leaks
- clone: use free() instead of UNLEAK()
- commit-graph: use free() instead of UNLEAK()
- bundle.c: don't leak the "args" in the "struct child_process"
- tests: mark tests as passing with SANITIZE=leak

Leak fixes.

Expecting a reroll.
source: <[email protected]>

* rj/branch-unborn-in-other-worktrees (2023-01-01) 2 commits
- branch: rename orphan branches in any worktree
- branch: description for orphan branch errors

Error messages given when working on an unborn branch that is checked out in another worktree have been improvved.
source: <[email protected]>

* rs/dup-array (2023-01-09) 5 commits
- use DUP_ARRAY
- add DUP_ARRAY
- do full type check in BARF_UNLESS_COPYABLE
- factor out BARF_UNLESS_COPYABLE
- mingw: make argv2 in try_shell_exec() non-const

Code cleaning.

Will merge to 'next'.
source: <[email protected]>
source: <[email protected]>

* ab/avoid-losing-exit-codes-in-tests (2022-12-20) 6 commits
- tests: don't lose misc "git" exit codes
- tests: don't lose "git" exit codes in "! ( git ... | grep )"
- tests: don't lose exit status with "test <op> $(git ...)"
- tests: don't lose exit status with "(cd ...; test <op> $(git ...))"
- t/lib-patch-mode.sh: fix ignored exit codes
- auto-crlf tests: don't lose exit code in loops and outside tests

Test clean-up.

Expecting a hopefully minor and final reroll.
cf. <[email protected]>
cf. <[email protected]>
source: <[email protected]>

* sk/win32-close-handle-upon-pthread-join (2023-01-04) 2 commits
- win32: close handles of threads that have been joined
- win32: prepare pthread.c for change by formatting

Pthread emulation on Win32 leaked thread handle when a thread is joined.

Will merge to 'next'?
<source: <[email protected]>

* ds/omit-trailing-hash-in-index (2023-01-07) 4 commits (merged to 'next' on 2023-01-09 at e17ef56485)
+ features: feature.manyFiles implies fast index writes
+ test-lib-functions: add helper for trailing hash
+ read-cache: add index.skipHash config option
+ hashfile: allow skipping the hash function

Introduce an optional configuration to allow the trailing hash that protects the index file from bit flipping.

Will merge to 'master'.
source: <[email protected]>

* es/t1509-root-fixes (2022-12-09) 3 commits
(merged to 'next' on 2023-01-08 at c922e34bab)
+ t1509: facilitate repeated script invocations
+ t1509: make "setup" test more robust
+ t1509: fix failing "root work tree" test due to owner-check

Test fixes.

Will merge to 'master'.
source: <[email protected]>

* jx/t1301-updates (2022-11-30) 3 commits
- t1301: do not change $CWD in "shared=all" test case
- t1301: use test_when_finished for cleanup
- t1301: fix wrong template dir for git-init

Test updates.

Will merge to 'next'?
source: <[email protected]>

* km/send-email-with-v-reroll-count (2022-11-27) 1 commit
- send-email: relay '-v N' to format-patch

"git send-email -v 3" used to be expanded to "git send-email --validate 3" when the user meant to pass them down to "format-patch", which has been corrected.
source: <[email protected]>

* ja/worktree-orphan (2023-01-08) 5 commits
- SQUASH???
- worktree add: add hint to direct users towards --orphan
- worktree add: add --orphan flag
- worktree add: refactor opt exclusion tests
- worktree add: include -B in usage docs

'git worktree add' learned how to create a worktree based on an orphaned branch with --orphan.

Breaks t2400 by using non-portable "grep -P".

 cf. https://github.com/git/git/actions/runs/3865911497/jobs/6589699288#step:6:1838
 source: <[email protected]>

* cc/filtered-repack (2022-12-25) 3 commits
- gc: add gc.repackFilter config option
- repack: add --filter=<filter-spec> option
- pack-objects: allow --filter without --stdout

"git repack" learns to discard objects that ought to be retrievable again from the promisor remote.

May want to discard. Its jaggy edges may be a bit too sharp. cf. <Y7WTv19aqiFCU8au@ncase>
source: <[email protected]>

* mc/credential-helper-auth-headers (2022-12-13) 8 commits
- t5556: add HTTP authentication tests
- test-http-server: add simple authentication
- test-http-server: pass Git requests to http-backend
- test-http-server: add HTTP request parsing
- test-http-server: add HTTP error response function
- test-http-server: add stub HTTP server test helper
- credential: add WWW-Authenticate header to cred requests
- http: read HTTP WWW-Authenticate response headers

Extending credential helper protocol.

Waiting for review responses (or a reroll).
cf. <[email protected]>
source: <[email protected]>

#1 lore raw

es/hooks-and-local-env (was "What's cooking in git.git (Jan 2023, #03; Mon, 9)")

Quoted 7 lines · Junio C Hamano

* es/hooks-and-local-env (2023-01-09) 1 commit
- githooks: discuss Git operations in foreign repositories

Doc update for environment variables set when hooks are invoked.

Will merge to 'next'?
source: <[email protected]>

I just submitted[1] v2 which incorporates a refined version of your suggested improvement[2].

[1]: https://lore.kernel.org/git/[email protected]/
[2]: https://lore.kernel.org/git/[email protected]/

#2 lore raw

pb/doc-orig-head (was: Re: What's cooking in git.git (Jan 2023, #03; Mon, 9))

In reply to Junio C Hamano

Hi Junio,

Le 2023-01-09 à 09:58, Junio C Hamano a écrit :

Quoted 11 lines

* pb/doc-orig-head (2023-01-08) 5 commits
- git-rebase.txt: add a note about 'ORIG_HEAD' being overwritten
- revisions.txt: be explicit about commands writing 'ORIG_HEAD'
- git-merge.txt: mention 'ORIG_HEAD' in the Description
- git-reset.txt: mention 'ORIG_HEAD' in the Description
- git-cherry-pick.txt: do not use 'ORIG_HEAD' in example

Document ORIG_HEAD a bit more.

Will merge to 'next'?
source: <[email protected]>

I've sent a v2 with an added link to the mailing list thread that initiated the series.

#3 lore raw
In reply to Junio C Hamano
Quoted 7 lines · Junio C Hamano

* tl/notes--blankline (2022-11-09) 5 commits
- notes.c: introduce "--no-blank-line" option
- notes.c: provide tips when target and append note are both empty
- notes.c: drop unreachable code in 'append_edit()'
- notes.c: cleanup for "designated init" and "char ptr init"
- notes.c: cleanup 'strbuf_grow' call in 'append_edit'

Quoted 6 lines

'git notes append' was taught '--[no-]blank-line' to conditionally add a LF between a new and existing note.

Expecting a reroll.
cf. <CAPig+cRcezSp4Rqt1Y9bD-FT6+7b0g9qHfbGRx65AOnw2FQXKg@mail.gmail.com>
source: <[email protected]>

Sorry for late reply, I just post a new patch on this topic.

Thanks.