From: Christian Couder <christian.couder@gmail.com>
To: git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>, Jeff King <peff@peff.net>,
Ben Peart <Ben.Peart@microsoft.com>,
Jonathan Tan <jonathantanmy@google.com>,
Nguyen Thai Ngoc Duy <pclouds@gmail.com>,
Mike Hommey <mh@glandium.org>,
Lars Schneider <larsxschneider@gmail.com>,
Eric Wong <e@80x24.org>,
Christian Couder <chriscool@tuxfamily.org>,
Jeff Hostetler <jeffhost@microsoft.com>,
Eric Sunshine <sunshine@sunshineco.com>,
Beat Bolli <dev+git@drbeat.li>,
Christian Couder <christian.couder@gmail.com>
Subject: [PATCH v5 7/8] t0410: test fetching from many promisor remotes
Date: Tue, 25 Sep 2018 13:53:40 +0200 [thread overview]
Message-ID: <20180925115341.19248-8-chriscool@tuxfamily.org> (raw)
In-Reply-To: <20180925115341.19248-1-chriscool@tuxfamily.org>
From: Christian Couder <christian.couder@gmail.com>
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
t/t0410-partial-clone.sh | 24 +++++++++++++++++++++++-
1 file changed, 23 insertions(+), 1 deletion(-)
diff --git a/t/t0410-partial-clone.sh b/t/t0410-partial-clone.sh
index 8b32be6417..3fbd8d919e 100755
--- a/t/t0410-partial-clone.sh
+++ b/t/t0410-partial-clone.sh
@@ -170,6 +170,28 @@ test_expect_success 'fetching of missing objects' '
git verify-pack --verbose "$IDX" | grep "$HASH"
'
+test_expect_success 'fetching of missing objects from another odb remote' '
+ git clone "file://$(pwd)/server" server2 &&
+ test_commit -C server2 bar &&
+ git -C server2 repack -a -d --write-bitmap-index &&
+ HASH2=$(git -C server2 rev-parse bar) &&
+
+ git -C repo remote add server2 "file://$(pwd)/server2" &&
+ git -C repo config odb.magic2.promisorRemote server2 &&
+ git -C repo cat-file -p "$HASH2" &&
+
+ git -C repo fetch server2 &&
+ rm -rf repo/.git/objects/* &&
+ git -C repo cat-file -p "$HASH2" &&
+
+ # Ensure that the .promisor file is written, and check that its
+ # associated packfile contains the object
+ ls repo/.git/objects/pack/pack-*.promisor >promisorlist &&
+ test_line_count = 1 promisorlist &&
+ IDX=$(cat promisorlist | sed "s/promisor$/idx/") &&
+ git verify-pack --verbose "$IDX" | grep "$HASH2"
+'
+
test_expect_success 'fetching of missing objects works with ref-in-want enabled' '
# ref-in-want requires protocol version 2
git -C server config protocol.version 2 &&
@@ -183,7 +205,7 @@ test_expect_success 'fetching of missing objects works with ref-in-want enabled'
'
test_expect_success 'rev-list stops traversal at missing and promised commit' '
- rm -rf repo &&
+ rm -rf repo server server2 &&
test_create_repo repo &&
test_commit -C repo foo &&
test_commit -C repo bar &&
--
2.19.0.278.gca5b891cac
next prev parent reply other threads:[~2018-09-25 11:54 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-25 11:53 [PATCH v5 0/8] Introducing remote ODBs Christian Couder
2018-09-25 11:53 ` [PATCH v5 1/8] fetch-object: make functions return an error code Christian Couder
2018-09-25 11:53 ` [PATCH v5 2/8] Add initial remote odb support Christian Couder
2018-09-25 11:53 ` [PATCH v5 3/8] remote-odb: implement remote_odb_get_direct() Christian Couder
2018-09-25 11:53 ` [PATCH v5 4/8] remote-odb: add remote_odb_reinit() Christian Couder
2018-09-25 11:53 ` [PATCH v5 5/8] Use remote_odb_get_direct() and has_remote_odb() Christian Couder
2018-09-25 11:53 ` [PATCH v5 6/8] Use odb.origin.partialclonefilter instead of core.partialclonefilter Christian Couder
2018-09-25 11:53 ` Christian Couder [this message]
2018-09-28 10:35 ` [PATCH v5 7/8] t0410: test fetching from many promisor remotes SZEDER Gábor
2018-09-28 11:43 ` Christian Couder
2018-09-25 11:53 ` [PATCH v5 8/8] Documentation/config: add odb.<name>.promisorRemote Christian Couder
2018-09-25 15:02 ` Duy Nguyen
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180925115341.19248-8-chriscool@tuxfamily.org \
--to=christian.couder@gmail.com \
--cc=Ben.Peart@microsoft.com \
--cc=chriscool@tuxfamily.org \
--cc=dev+git@drbeat.li \
--cc=e@80x24.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jeffhost@microsoft.com \
--cc=jonathantanmy@google.com \
--cc=larsxschneider@gmail.com \
--cc=mh@glandium.org \
--cc=pclouds@gmail.com \
--cc=peff@peff.net \
--cc=sunshine@sunshineco.com \
/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.
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 NNTP newsgroup(s).