git/builtin, branch v2.46.2

Merge branch 'bl/trailers-and-incomplete-last-line-fix' into maint-2.46

2024-09-23T17:33:00Z

The interpret-trailers command failed to recognise the end of the message when the commit log ends in an incomplete line. * bl/trailers-and-incomplete-last-line-fix: interpret-trailers: handle message without trailing newline

Revert "Merge branch 'jc/patch-id' into maint-2.46"

2024-09-16T22:12:06Z

This reverts commit 41c952ebacf7e3369e7bee721f768114d65e50c4, reversing changes made to 712d970c0145b95ce655773e7cd1676f09dfd215. Keeping a known breakage for now is better than introducing new regression(s).

Merge branch 'jc/config-doc-update' into maint-2.46

2024-09-13T22:26:52Z

Docfix. * jc/config-doc-update: git-config.1: fix description of --regexp in synopsis git-config.1: --get-all description update

Merge branch 'ps/stash-keep-untrack-empty-fix' into maint-2.46

2024-09-13T22:26:51Z

A corner case bug in "git stash" was fixed. * ps/stash-keep-untrack-empty-fix: builtin/stash: fix `--keep-index --include-untracked` with empty HEAD

Merge branch 'ps/index-pack-outside-repo-fix' into maint-2.46

2024-09-13T22:26:50Z

"git verify-pack" and "git index-pack" started dying outside a repository, which has been corrected. * ps/index-pack-outside-repo-fix: builtin/index-pack: fix segfaults when running outside of a repo

Merge branch 'ps/bundle-outside-repo-fix' into maint-2.46

2024-09-12T18:02:16Z

"git bundle unbundle" outside a repository triggered a BUG() unnecessarily, which has been corrected. * ps/bundle-outside-repo-fix: bundle: default to SHA1 when reading bundle headers builtin/bundle: have unbundle check for repo before opening its bundle

Merge branch 'jc/patch-id' into maint-2.46

2024-09-12T18:02:16Z

The patch parser in "git patch-id" has been tightened to avoid getting confused by lines that look like a patch header in the log message. cf. * jc/patch-id: patch-id: tighten code to detect the patch header patch-id: rewrite code that detects the beginning of a patch patch-id: make get_one_patchid() more extensible patch-id: call flush_current_id() only when needed t4204: patch-id supports various input format

interpret-trailers: handle message without trailing newline

2024-09-06T16:21:44Z

When git-interpret-trailers is used to add a trailer to a message that does not end in a trailing newline, the new trailer is added on the line immediately following the message instead of as a trailer block separated from the message by a blank line. For example, if a message's text was exactly "The subject" with no trailing newline present, `git interpret-trailers --trailer my-trailer=true` will result in the following malformed commit message: The subject my-trailer: true While it is generally expected that a commit message should end with a newline character, git-interpret-trailers should not be returning an invalid message in this case. Use `strbuf_complete_line` to ensure that the message ends with a newline character when reading the input. Signed-off-by: Brian Lyles Signed-off-by: Junio C Hamano

builtin/index-pack: fix segfaults when running outside of a repo

2024-09-04T14:40:00Z

It was reported that git-verify-pack(1) has started to crash with Git v2.46.0 when run outside of a repository. This is another fallout from c8aed5e8da (repository: stop setting SHA1 as the default object hash, 2024-05-07), where we have stopped setting the default hash algorithm for `the_repository`. Consequently, code that relies on `the_hash_algo` will now crash when it hasn't explicitly been initialized, which may be the case when running outside of a Git repository. The crash is not in git-verify-pack(1) but instead in git-index-pack(1), which gets called by the former. Ideally, both of these programs should be able to identify the hash algorithm used by the packfile and index without having to rely on external information. But unfortunately, the format for neither of them is completely self-describing, so it is not possible to derive that information. This is a design issue that we should address by introducing a new packfile version that encodes its object hash. For now though the more important fix is to not make either of these programs crash anymore, which we do by falling back to SHA1 when the object hash is unconfigured. This pessimizes reading packfiles which use a different hash than SHA1, but restores previous behaviour. Reported-by: Ilya K Signed-off-by: Patrick Steinhardt Signed-off-by: Junio C Hamano

git-config.1: fix description of --regexp in synopsis

2024-08-26T18:49:37Z

The synopsis says --regexp= but the --regexp option is a Boolean that says "the name given is not literal, but a pattern to match the name". Signed-off-by: Junio C Hamano