| Message ID | 20180925115341.19248-8-chriscool@tuxfamily.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Introducing remote ODBs | expand |
On Tue, Sep 25, 2018 at 01:53:40PM +0200, Christian Couder wrote: > 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/") && You could drop the unnecessary 'cat', 'sed' is capable to open a file on its own. > + git verify-pack --verbose "$IDX" | grep "$HASH2" Don't run a git command, especially one with "verify" in its name, upstream of a pipe, because the pipe hides the git command's exit code. > +'
On Fri, Sep 28, 2018 at 12:35 PM SZEDER Gábor <szeder.dev@gmail.com> wrote: > > On Tue, Sep 25, 2018 at 01:53:40PM +0200, Christian Couder wrote: > > + IDX=$(cat promisorlist | sed "s/promisor$/idx/") && > > You could drop the unnecessary 'cat', 'sed' is capable to open a file > on its own. > > > + git verify-pack --verbose "$IDX" | grep "$HASH2" > > Don't run a git command, especially one with "verify" in its name, > upstream of a pipe, because the pipe hides the git command's exit > code. Yeah, I copied both of the above lines from the test just above the one I added. So I will probably add a patch to fix those kinds of issues in t0410 at the beginning of the series, and then of course copy the fixed tests in the tests I add. Thanks, Christian.
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 &&