On Tue, Sep 25, 2018 at 01:53:40PM +0200, Christian Couder wrote:
> From: Christian Couder <[email protected]>
> 
> Signed-off-by: Christian Couder <[email protected]>
> Signed-off-by: Junio C Hamano <[email protected]>
> ---
>  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.

> +'

Reply via email to