summaryrefslogtreecommitdiff
path: root/t/helper
diff options
context:
space:
mode:
authorJohannes Schindelin <johannes.schindelin@gmx.de>2024-02-28 09:44:08 (GMT)
committerJunio C Hamano <gitster@pobox.com>2024-02-28 17:47:03 (GMT)
commit207c40e1e43c992a8b268a3395ca104566612c6e (patch)
tree0e09e5d3992ab8689be058cf9a4de1dc0dd520e0 /t/helper
parente67431d4965d13b185db3ddb4445c3c7034ca62d (diff)
downloadgit-207c40e1e43c992a8b268a3395ca104566612c6e.zip
git-207c40e1e43c992a8b268a3395ca104566612c6e.tar.gz
git-207c40e1e43c992a8b268a3395ca104566612c6e.tar.bz2
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>
Diffstat (limited to 't/helper')
-rw-r--r--t/helper/test-reach.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/helper/test-reach.c b/t/helper/test-reach.c
index 1e159a7..c96b62f 100644
--- a/t/helper/test-reach.c
+++ b/t/helper/test-reach.c
@@ -111,7 +111,7 @@ int cmd__reach(int ac, const char **av)
repo_in_merge_bases(the_repository, A, B));
else if (!strcmp(av[1], "in_merge_bases_many"))
printf("%s(A,X):%d\n", av[1],
- repo_in_merge_bases_many(the_repository, A, X_nr, X_array));
+ repo_in_merge_bases_many(the_repository, A, X_nr, X_array, 0));
else if (!strcmp(av[1], "is_descendant_of"))
printf("%s(A,X):%d\n", av[1], repo_is_descendant_of(r, A, X));
else if (!strcmp(av[1], "get_merge_bases_many")) {