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

From: Junio C Hamano <gitster@pobox.com>
Date: Jul 15, 2014, 19:48 UTC
Message-ID: <xmqq8unuv1wm.fsf@gitster.dls.corp.google.com>
In-Reply-To: <53C510A9.4010208@gmail.com>

Ephrim Khong <dr.khong@gmail.com> writes:

Show 17 quoted lines

> 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 &&

Do you need this artificially strange environment settings for the problem to manifest itself, or is it sufficient to have a non-canonical pathname in the info/alternates file?

Exporting an environment early in the test and having later tests in the file depend on it makes it harder to debug when things go wrong, than leaving an info/alternates file in the repository, primarily because the latter can be inspected more easily in the trash directory after "t7702-*.sh -i" dies, hence the above question.

> +	touch a &&

Don't use 'touch' if you are not interested in timestams.  Write this as

	>a &&

because what you care about here in this test is that an empty file 'a' exists, so that you can run "git add" on it.

Show 12 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