mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-20 02:56:12 +02:00
Code

Merge branch 'hx/lookup-commit-in-graph-fix' into maint 

A corner case bug where lazily fetching objects from a promisor
remote resulted in infinite recursion has been corrected.
source: <cover.1656593279.git.hanxin.hx@bytedance.com>

* hx/lookup-commit-in-graph-fix:
  t5330: remove run_with_limited_processses()
  commit-graph.c: no lazy fetch in lookup_commit_in_graph()
This commit is contained in:
Junio C Hamano 2022-08-10 21:52:32 -07:00
parent a6aeb2fef9 cb88b37cb9
commit 312d5b7429
2 changed files with 48 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
commit-graph.c
View File

@ -898,7 +898,7 @@ struct commit *lookup_commit_in_graph(struct repository *repo, const struct obje
return NULL;
if (!search_commit_pos_in_graph(id, repo->objects->commit_graph, &pos))
return NULL;
if (!repo_has_object_file(repo, id))
if (!has_object(repo, id, 0))
return NULL;
commit = lookup_commit(repo, id);

47
t/t5330-no-lazy-fetch-with-commit-graph.sh Executable file
View File

@ -0,0 +1,47 @@
#!/bin/sh
test_description='test for no lazy fetch with the commit-graph'
. ./test-lib.sh
test_expect_success 'setup: prepare a repository with a commit' '
git init with-commit &&
test_commit -C with-commit the-commit &&
oid=$(git -C with-commit rev-parse HEAD)
'
test_expect_success 'setup: prepare a repository with commit-graph contains the commit' '
git init with-commit-graph &&
echo "$(pwd)/with-commit/.git/objects" \
>with-commit-graph/.git/objects/info/alternates &&
# create a ref that points to the commit in alternates
git -C with-commit-graph update-ref refs/ref_to_the_commit "$oid" &&
# prepare some other objects to commit-graph
test_commit -C with-commit-graph something &&
git -c gc.writeCommitGraph=true -C with-commit-graph gc &&
test_path_is_file with-commit-graph/.git/objects/info/commit-graph
'
test_expect_success 'setup: change the alternates to what without the commit' '
git init --bare without-commit &&
git -C with-commit-graph cat-file -e $oid &&
echo "$(pwd)/without-commit/objects" \
>with-commit-graph/.git/objects/info/alternates &&
test_must_fail git -C with-commit-graph cat-file -e $oid
'
test_expect_success 'fetch any commit from promisor with the usage of the commit graph' '
# setup promisor and prepare any commit to fetch
git -C with-commit-graph remote add origin "$(pwd)/with-commit" &&
git -C with-commit-graph config remote.origin.promisor true &&
git -C with-commit-graph config remote.origin.partialclonefilter blob:none &&
test_commit -C with-commit any-commit &&
anycommit=$(git -C with-commit rev-parse HEAD) &&
GIT_TRACE="$(pwd)/trace.txt" \
git -C with-commit-graph fetch origin $anycommit 2>err &&
! grep "fatal: promisor-remote: unable to fork off fetch subprocess" err &&
grep "git fetch origin" trace.txt >actual &&
test_line_count = 1 actual
'
test_done