From: Han Xin <hanxin.hx@bytedance.com>
To: me@ttaylorr.com
Cc: chiyutianyi@gmail.com, derrickstolee@github.com,
git@vger.kernel.org, haiyangtand@gmail.com,
jonathantanmy@google.com, ps@pks.im,
Han Xin <hanxin.hx@bytedance.com>
Subject: [RFC PATCH 2/2] fetch-pack.c: pass "oi_flags" to lookup_commit_in_graph()
Date: Thu, 16 Jun 2022 11:38:33 +0800 [thread overview]
Message-ID: <03ec01ab398bc4967f7ac8ccab510cac2d6785be.1655350442.git.hanxin.hx@bytedance.com> (raw)
In-Reply-To: <cover.1655350442.git.hanxin.hx@bytedance.com>
As the custom "oi_flags" is missed by lookup_commit_in_graph(), we will
get another lazy fetch round if we found the commit in commit graph but
miss it in the local object repository.
We can see the issue via[1].
1. https://lore.kernel.org/git/20220612161707.21807-1-chiyutianyi@gmail.com/
Signed-off-by: Han Xin <hanxin.hx@bytedance.com>
---
fetch-pack.c | 10 +++----
t/t5583-fetch-with-commit-graph.sh | 47 ++++++++++++++++++++++++++++++
2 files changed, 52 insertions(+), 5 deletions(-)
create mode 100644 t/t5583-fetch-with-commit-graph.sh
diff --git a/fetch-pack.c b/fetch-pack.c
index 4a62fb182e..ca1234e456 100644
--- a/fetch-pack.c
+++ b/fetch-pack.c
@@ -123,7 +123,7 @@ static struct commit *deref_without_lazy_fetch_extended(const struct object_id *
struct object_info info = { .typep = type };
struct commit *commit;
- commit = lookup_commit_in_graph(the_repository, oid, 0);
+ commit = lookup_commit_in_graph(the_repository, oid, oi_flags);
if (commit)
return commit;
@@ -704,6 +704,7 @@ static void mark_complete_and_common_ref(struct fetch_negotiator *negotiator,
struct ref *ref;
int old_save_commit_buffer = save_commit_buffer;
timestamp_t cutoff = 0;
+ int oi_flags = OBJECT_INFO_SKIP_FETCH_OBJECT | OBJECT_INFO_QUICK;
if (args->refetch)
return;
@@ -714,13 +715,12 @@ static void mark_complete_and_common_ref(struct fetch_negotiator *negotiator,
for (ref = *refs; ref; ref = ref->next) {
struct commit *commit;
- commit = lookup_commit_in_graph(the_repository, &ref->old_oid, 0);
+ commit = lookup_commit_in_graph(the_repository, &ref->old_oid,
+ oi_flags);
if (!commit) {
struct object *o;
- if (!has_object_file_with_flags(&ref->old_oid,
- OBJECT_INFO_QUICK |
- OBJECT_INFO_SKIP_FETCH_OBJECT))
+ if (!has_object_file_with_flags(&ref->old_oid, oi_flags))
continue;
o = parse_object(the_repository, &ref->old_oid);
if (!o || o->type != OBJ_COMMIT)
diff --git a/t/t5583-fetch-with-commit-graph.sh b/t/t5583-fetch-with-commit-graph.sh
new file mode 100644
index 0000000000..cb2beafa8d
--- /dev/null
+++ b/t/t5583-fetch-with-commit-graph.sh
@@ -0,0 +1,47 @@
+#!/bin/sh
+
+test_description='test for fetching missing object with a full commit-graph'
+
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+. ./test-lib.sh
+
+test_expect_success 'setup' '
+ git init --bare dest.git &&
+ test_commit one &&
+ git checkout -b testbranch &&
+ test_commit two &&
+ git push dest.git --all
+'
+
+test_expect_success 'prepare a alternates repository without testbranch' '
+ git clone -b $GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME dest.git alternates &&
+ oid=$(git -C alternates rev-parse refs/remotes/origin/testbranch) &&
+ git -C alternates update-ref -d refs/remotes/origin/testbranch &&
+ git -C alternates gc --prune=now
+'
+
+test_expect_success 'prepare a repository with a full commit-graph' '
+ git init source &&
+ echo "$(pwd)/dest.git/objects" >source/.git/objects/info/alternates &&
+ git -C source remote add origin "$(pwd)/dest.git" &&
+ git -C source config remote.origin.promisor true &&
+ git -C source config remote.origin.partialclonefilter blob:none &&
+ git -C source fetch origin &&
+ (
+ cd source &&
+ test_commit three &&
+ git -c gc.writeCommitGraph=true gc
+ )
+'
+
+test_expect_success 'change the alternates to that without commit two' '
+ echo "$(pwd)/alternates/.git/objects" >source/.git/objects/info/alternates
+'
+
+test_expect_success 'fetch the missing object' '
+ git -C source fetch origin $oid
+'
+
+test_done
--
2.36.1
next prev parent reply other threads:[~2022-06-16 3:39 UTC|newest]
Thread overview: 50+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-14 7:25 An endless loop fetching issue with partial clone, alternates and commit graph Haiyng Tan
2022-06-15 2:18 ` Taylor Blau
2022-06-16 3:38 ` [RFC PATCH 0/2] " Han Xin
2022-06-16 3:38 ` [RFC PATCH 1/2] commit-graph.c: add "flags" to lookup_commit_in_graph() Han Xin
2022-06-16 3:38 ` Han Xin [this message]
2022-06-17 21:47 ` [RFC PATCH 0/2] Re: An endless loop fetching issue with partial clone, alternates and commit graph Jonathan Tan
2022-06-18 3:01 ` [PATCH v1] commit-graph.c: no lazy fetch in lookup_commit_in_graph() Han Xin
2022-06-20 7:07 ` Patrick Steinhardt
2022-06-20 8:53 ` [External] " 欣韩
2022-06-20 9:05 ` Patrick Steinhardt
2022-06-21 18:23 ` Jonathan Tan
2022-06-22 3:17 ` Han Xin
2022-06-24 5:27 ` [PATCH v2 0/2] " Han Xin
2022-06-24 5:27 ` [PATCH v2 1/2] test-lib.sh: add limited processes to test-lib Han Xin
2022-06-24 16:03 ` Junio C Hamano
2022-06-25 1:35 ` Han Xin
2022-06-27 12:22 ` Junio C Hamano
2022-06-24 5:27 ` [PATCH v2 2/2] commit-graph.c: no lazy fetch in lookup_commit_in_graph() Han Xin
2022-06-24 16:56 ` Junio C Hamano
2022-06-25 2:25 ` Han Xin
2022-06-25 2:31 ` Han Xin
2022-06-28 2:02 ` [PATCH v3 0/2] " Han Xin
2022-06-28 2:02 ` [PATCH v3 1/2] test-lib.sh: add limited processes to test-lib Han Xin
2022-06-28 2:02 ` [PATCH v3 2/2] commit-graph.c: no lazy fetch in lookup_commit_in_graph() Han Xin
2022-06-28 7:49 ` Ævar Arnfjörð Bjarmason
2022-06-28 17:36 ` Junio C Hamano
2022-06-30 12:21 ` Johannes Schindelin
2022-06-30 13:43 ` Ævar Arnfjörð Bjarmason
2022-06-30 15:40 ` Junio C Hamano
2022-06-30 18:47 ` Ævar Arnfjörð Bjarmason
2022-07-01 19:31 ` Johannes Schindelin
2022-07-01 20:47 ` Junio C Hamano
2022-06-29 2:08 ` Han Xin
2022-06-30 17:37 ` test name conflict + js/ci-github-workflow-markup regression (was: [PATCH v3 0/2] no lazy fetch in lookup_commit_in_graph()) Ævar Arnfjörð Bjarmason
2022-07-01 1:34 ` [PATCH v4 0/1] no lazy fetch in lookup_commit_in_graph() Han Xin
2022-07-01 1:34 ` [PATCH v4 1/1] commit-graph.c: " Han Xin
2022-07-09 12:23 ` Michael J Gruber
2022-07-11 15:09 ` Jeff King
2022-07-11 20:17 ` Junio C Hamano
2022-07-12 1:52 ` [External] " Han Xin
2022-07-12 5:23 ` Junio C Hamano
2022-07-12 5:32 ` Han Xin
2022-07-12 6:37 ` [External] " Jeff King
2022-07-12 14:19 ` Junio C Hamano
2022-07-12 6:50 ` [PATCH v5 0/1] " Han Xin
2022-07-12 6:50 ` [PATCH v5 1/1] commit-graph.c: " Han Xin
2022-07-12 9:50 ` Ævar Arnfjörð Bjarmason
2022-07-13 1:26 ` Han Xin
2022-07-12 6:58 ` [PATCH v5 0/1] " Jeff King
2022-07-12 8:01 ` [PATCH v1] t5330: remove run_with_limited_processses() Han Xin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=03ec01ab398bc4967f7ac8ccab510cac2d6785be.1655350442.git.hanxin.hx@bytedance.com \
--to=hanxin.hx@bytedance.com \
--cc=chiyutianyi@gmail.com \
--cc=derrickstolee@github.com \
--cc=git@vger.kernel.org \
--cc=haiyangtand@gmail.com \
--cc=jonathantanmy@google.com \
--cc=me@ttaylorr.com \
--cc=ps@pks.im \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).