threads / patch / 48576

patcht990X: use '.git/objects' as 'deep inside .git' path

Subject: [PATCH] t990X: use '.git/objects' as 'deep inside .git' path

## tl;dr

3 messages between May 26, 2018 and May 29, 2018. Diffs are folded; open one to read it.

replies: 2people: 3as markdown or json

Christian Couder· May 26, 2018, 06:47 UTC · lore

Tests t9902-completion.sh and t9903-bash-prompt.sh each have tests that check what happens when we are "in the '.git' directory" and when we are "deep inside the '.git' directory".

To test the case when we are "deep inside the '.git' directory" the test scripts used to perform a `cd .git/refs/heads`.

As there are plans to implement other ref storage systems, let's use '.git/objects' instead of '.git/refs/heads' as the "deep inside the '.git' directory" path.

This makes it clear to readers that these tests do not depend on which ref backend is used.

The internals of the loose refs backend are still tested in t1400-update-ref.sh.

Helped-by: SZEDER Gábor <szeder.dev@gmail.com>
Signed-off-by: David Turner <dturner@twopensource.com>
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
---
 t/t9902-completion.sh  | 2 +-
 t/t9903-bash-prompt.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Show changes to 2 files +2 −2

t/t9902-completion.sh, t/t9903-bash-prompt.sh

diff --git a/t/t9902-completion.sh b/t/t9902-completion.sh
index 36deb0b123..a28640ce1a 100755
--- a/t/t9902-completion.sh
+++ b/t/t9902-completion.sh
@@ -181,7 +181,7 @@ test_expect_success '__git_find_repo_path - cwd is a .git directory' '
 test_expect_success '__git_find_repo_path - parent is a .git directory' '
 	echo "$ROOT/.git" >expected &&
 	(
-		cd .git/refs/heads &&
+		cd .git/objects &&
 		__git_find_repo_path &&
 		echo "$__git_repo_path" >"$actual"
 	) &&
diff --git a/t/t9903-bash-prompt.sh b/t/t9903-bash-prompt.sh
index 8f5c811dd7..c3b89ae783 100755
--- a/t/t9903-bash-prompt.sh
+++ b/t/t9903-bash-prompt.sh
@@ -148,7 +148,7 @@ test_expect_success 'prompt - inside .git directory' '
 test_expect_success 'prompt - deep inside .git directory' '
 	printf " (GIT_DIR!)" >expected &&
 	(
-		cd .git/refs/heads &&
+		cd .git/objects &&
 		__git_ps1 >"$actual"
 	) &&
 	test_cmp expected "$actual"

-- 
2.17.0.1181.g093e983b05.dirty

Michael Haggerty· May 27, 2018, 04:49 UTC · re: Christian Couder · lore

Re: [PATCH] t990X: use '.git/objects' as 'deep inside .git' path

On Sat, May 26, 2018 at 8:47 AM, Christian Couder <christian.couder@gmail.com> wrote:

Show 10 quoted lines

> Tests t9902-completion.sh and t9903-bash-prompt.sh each have tests
> that check what happens when we are "in the '.git' directory" and
> when we are "deep inside the '.git' directory".
>
> To test the case when we are "deep inside the '.git' directory" the
> test scripts used to perform a `cd .git/refs/heads`.
>
> As there are plans to implement other ref storage systems, let's
> use '.git/objects' instead of '.git/refs/heads' as the "deep inside
> the '.git' directory" path.

Seems reasonable to me. +1.

Michael

Derrick Stolee· May 29, 2018, 11:58 UTC · re: Michael Haggerty · lore

Re: [PATCH] t990X: use '.git/objects' as 'deep inside .git' path

On 5/27/2018 12:49 AM, Michael Haggerty wrote:

Show 15 quoted lines

> On Sat, May 26, 2018 at 8:47 AM, Christian Couder
> <christian.couder@gmail.com> wrote:
>> Tests t9902-completion.sh and t9903-bash-prompt.sh each have tests
>> that check what happens when we are "in the '.git' directory" and
>> when we are "deep inside the '.git' directory".
>>
>> To test the case when we are "deep inside the '.git' directory" the
>> test scripts used to perform a `cd .git/refs/heads`.
>>
>> As there are plans to implement other ref storage systems, let's
>> use '.git/objects' instead of '.git/refs/heads' as the "deep inside
>> the '.git' directory" path.
> Seems reasonable to me. +1.
>
> Michael

Looks good to me, too.

Thanks, -Stolee