Re: [PATCH v3] sha1_file: do not add own object directory as alternate

From: Eric Sunshine <sunshine@sunshineco.com>
Date: Jul 15, 2014, 19:33 UTC
Message-ID: <CAPig+cQDbU6Qii4we-8oPdSeXiqhBWmjJ+VwTwBivnAOxBzS_A@mail.gmail.com>
In-Reply-To: <53C510A9.4010208@gmail.com>

On Tue, Jul 15, 2014 at 7:29 AM, Ephrim Khong <dr.khong@gmail.com> wrote:

Show 25 quoted lines

> When adding alternate object directories, we try not to add the
> directory of the current repository to avoid cycles.  Unfortunately,
> that test was broken, since it compared an absolute with a relative
> path.
>
> Signed-off-by: Ephrim Khong <dr.khong@gmail.com>
> ---
> diff --git a/t/t7702-repack-cyclic-alternate.sh b/t/t7702-repack-cyclic-alternate.sh
> new file mode 100755
> index 0000000..8341d46
> --- /dev/null
> +++ b/t/t7702-repack-cyclic-alternate.sh
> @@ -0,0 +1,24 @@
> +#!/bin/sh
> +#
> +# Copyright (c) 2014 Ephrim Khong
> +#
> +
> +test_description='repack involving cyclic alternate'
> +. ./test-lib.sh
> +
> +test_expect_success setup '
> +       GIT_OBJECT_DIRECTORY=.git//../.git/objects &&
> +       export GIT_OBJECT_DIRECTORY &&
> +       touch a &&

Since the existence of 'a' is significant here, not its timestamp, it would be clearer to create the file with:

    >a &&

Show 14 quoted lines

> +       git add a &&
> +       git commit -m 1 &&
> +       git repack -adl &&
> +       echo "$(pwd)"/.git/objects/../objects >.git/objects/info/alternates
> +'
> +
> +test_expect_success 're-packing repository with itsself as alternate' '
> +       git repack -adl &&
> +       git fsck
> +'
> +
> +test_done
> --
> 1.8.4.3