]> git.ipfire.org Git - thirdparty/git.git/commit
commit-reach(repo_in_merge_bases_many): optionally expect missing commits
authorJohannes Schindelin <johannes.schindelin@gmx.de>
Wed, 28 Feb 2024 09:44:08 +0000 (09:44 +0000)
committerJunio C Hamano <gitster@pobox.com>
Wed, 28 Feb 2024 17:47:03 +0000 (09:47 -0800)
commit207c40e1e43c992a8b268a3395ca104566612c6e
tree0e09e5d3992ab8689be058cf9a4de1dc0dd520e0
parente67431d4965d13b185db3ddb4445c3c7034ca62d
commit-reach(repo_in_merge_bases_many): optionally expect missing commits

Currently this function treats unrelated commit histories the same way
as commit histories with missing commit objects.

Typically, missing commit objects constitute a corrupt repository,
though, and should be reported as such. The next commits will make it
so, but there is one exception: In `git fetch --update-shallow` we
_expect_ commit objects to be missing, and we do want to treat the
now-incomplete commit histories as unrelated.

To allow for that, let's introduce an additional parameter that is
passed to `repo_in_merge_bases_many()` to trigger this behavior, and use
it in the two callers in `shallow.c`.

This commit changes behavior slightly: unless called from the
`shallow.c` functions that set the `ignore_missing_commits` bit, any
non-existing tip commit that is passed to `repo_in_merge_bases_many()`
will now result in an error.

Note: When encountering missing commits while traversing the commit
history in search for merge bases, with this commit there won't be a
change in behavior just yet, their children will still be interpreted as
root commits. This bug will get fixed by follow-up commits.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit-reach.c
commit-reach.h
remote.c
shallow.c
t/helper/test-reach.c