git/t, branch v2.44.0

Merge branch 'la/trailer-cleanups'

2024-02-20T04:58:06Z

Fix to an already-graduated topic. * la/trailer-cleanups: trailer: fix comment/cut-line regression with opts->no_divider

trailer: fix comment/cut-line regression with opts->no_divider

2024-02-20T03:06:18Z

Commit 97e9d0b78a (trailer: find the end of the log message, 2023-10-20) combined two code paths for finding the end of the log message. For the "no_divider" case, we used to use find_trailer_end(), and that has now been rolled into find_end_of_log_message(). But there's a regression; that function returns early when no_divider is set, returning the whole string. That's not how find_trailer_end() behaved. Although it did skip the "---" processing (which is what "no_divider" is meant to do), we should still respect ignored_log_message_bytes(), which covers things like comments, "commit -v" cut lines, and so on. The bug is actually in the interpret-trailers command, but the obvious way to experience it is by running "commit -v" with a "--trailer" option. The new trailer will be added at the end of the verbose diff, rather than before it (and consequently will be ignored entirely, since everything after the diff's intro scissors line is thrown away). I've added two tests here: one for interpret-trailers directly, which shows the bug via the parsing routines, and one for "commit -v". The fix itself is pretty simple: instead of returning early, no_divider just skips the "---" handling but still calls ignored_log_message_bytes(). Reported-by: Philippe Blain Signed-off-by: Jeff King Signed-off-by: Junio C Hamano

Merge branch 'pb/complete-config'

2024-02-14T23:36:06Z

The command line completion script (in contrib/) learned to complete configuration variable names better. * pb/complete-config: completion: add and use __git_compute_second_level_config_vars_for_section completion: add and use __git_compute_first_level_config_vars_for_section completion: complete 'submodule.*' config variables completion: add space after config variable names also in Bash 3

Merge branch 'vn/rebase-with-cherry-pick-authorship'

2024-02-14T23:36:05Z

"git cherry-pick" invoked during "git rebase -i" session lost the authorship information, which has been corrected. * vn/rebase-with-cherry-pick-authorship: sequencer: unset GIT_CHERRY_PICK_HELP for 'exec' commands

Merge branch 'pw/gc-during-rebase'

2024-02-14T23:36:05Z

The sequencer machinery does not use the ref API and instead records names of certain objects it needs for its correct operation in temporary files, which makes these objects susceptible to loss by garbage collection. These temporary files have been added as starting points for reachability analysis to fix this. * pw/gc-during-rebase: prune: mark rebase autostash and orig-head as reachable

Merge branch 'jc/unit-tests-make-relative-fix'

2024-02-13T22:31:11Z

The mechanism to report the filename in the source code, used by the unit-test machinery, assumed that the compiler expanded __FILE__ to the path to the source given to the $(CC), but some compilers give full path, breaking the output. This has been corrected. * jc/unit-tests-make-relative-fix: unit-tests: do show relative file paths on non-Windows, too

Merge branch 'tb/multi-pack-reuse-experiment'

2024-02-12T21:16:11Z

Setting `feature.experimental` opts the user into multi-pack reuse experiment * tb/multi-pack-reuse-experiment: pack-objects: enable multi-pack reuse via `feature.experimental` t5332-multi-pack-reuse.sh: extract pack-objects helper functions

Merge branch 'vd/for-each-ref-sort-with-formatted-timestamp'

2024-02-12T21:16:11Z

"git branch" and friends learned to use the formatted text as sorting key, not the underlying timestamp value, when the --sort option is used with author or committer timestamp with a format specifier (e.g., "--sort=creatordate:format:%H:%M:%S"). * vd/for-each-ref-sort-with-formatted-timestamp: ref-filter.c: sort formatted dates by byte value

Merge branch 'pw/show-ref-pseudorefs'

2024-02-12T21:16:11Z

"git show-ref --verify" did not show things like "CHERRY_PICK_HEAD", which has been corrected. * pw/show-ref-pseudorefs: t1400: use show-ref to check pseudorefs show-ref --verify: accept pseudorefs

Merge branch 'ps/report-failure-from-git-stash'

2024-02-12T21:16:11Z

"git stash" sometimes was silent even when it failed due to unwritable index file, which has been corrected. * ps/report-failure-from-git-stash: builtin/stash: report failure to write to index