Skip to content

Commit 948a7fd

Browse files
peffgitster
authored andcommitted
t5305: use "git -C"
This test unpacks objects into a separate repository, and accesses it by setting GIT_DIR in a subshell. We can do the same thing these days by using "git init <repo>" and "git -C". In most cases this is shorter, though when there are multiple commands, we may end up repeating the "-C". However, this repetition can actually be a good thing. This patch also fixes a bug introduced by 512477b (tests: use "env" to run commands with temporary env-var settings, 2014-03-18). That commit essentially converted: (GIT_DIR=...; export GIT_DIR cmd1 && cmd2) into: (GIT_DIR=... cmd1 && cmd2) which obviously loses the GIT_DIR setting for cmd2 (we never noticed the bug because it simply runs "cmd2" in the parent repo, which means we were simply failing to test anything interesting). By using "git -C" rather than a subshell, it becomes quite obvious where each command is supposed to be running. Signed-off-by: Jeff King <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 2076353 commit 948a7fd

File tree

1 file changed

+7
-21
lines changed

1 file changed

+7
-21
lines changed

t/t5305-include-tag.sh

Lines changed: 7 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -33,20 +33,14 @@ test_expect_success 'pack without --include-tag' '
3333

3434
test_expect_success 'unpack objects' '
3535
rm -rf clone.git &&
36-
(
37-
GIT_DIR=clone.git &&
38-
export GIT_DIR &&
39-
git init &&
40-
git unpack-objects <test-1-${packname_1}.pack
41-
)
36+
git init clone.git &&
37+
git -C clone.git unpack-objects <test-1-${packname_1}.pack
4238
'
4339

4440
test_expect_success 'check unpacked result (have commit, no tag)' '
4541
git rev-list --objects $commit >list.expect &&
46-
(
47-
test_must_fail env GIT_DIR=clone.git git cat-file -e $tag &&
48-
git rev-list --objects $commit
49-
) >list.actual &&
42+
test_must_fail git -C clone.git cat-file -e $tag &&
43+
git -C clone.git rev-list --objects $commit >list.actual &&
5044
test_cmp list.expect list.actual
5145
'
5246

@@ -59,21 +53,13 @@ test_expect_success 'pack with --include-tag' '
5953

6054
test_expect_success 'unpack objects' '
6155
rm -rf clone.git &&
62-
(
63-
GIT_DIR=clone.git &&
64-
export GIT_DIR &&
65-
git init &&
66-
git unpack-objects <test-2-${packname_1}.pack
67-
)
56+
git init clone.git &&
57+
git -C clone.git unpack-objects <test-2-${packname_1}.pack
6858
'
6959

7060
test_expect_success 'check unpacked result (have commit, have tag)' '
7161
git rev-list --objects mytag >list.expect &&
72-
(
73-
GIT_DIR=clone.git &&
74-
export GIT_DIR &&
75-
git rev-list --objects $tag
76-
) >list.actual &&
62+
git -C clone.git rev-list --objects $tag >list.actual &&
7763
test_cmp list.expect list.actual
7864
'
7965

0 commit comments

Comments
 (0)