Skip to content

Commit 99e1c73

Browse files
peffgitster
authored andcommitted
t0001: drop useless subshells
Many tests use subshells, but don't actually change the shell environment. They were probably cargo-culted from earlier tests which did need subshells. Drop the useless ones. Signed-off-by: Jeff King <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 0981140 commit 99e1c73

File tree

1 file changed

+22
-39
lines changed

1 file changed

+22
-39
lines changed

t/t0001-init.sh

Lines changed: 22 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -106,11 +106,8 @@ test_expect_success 'plain bare with GIT_WORK_TREE' '
106106
'
107107

108108
test_expect_success 'GIT_DIR bare' '
109-
110-
(
111-
mkdir git-dir-bare.git &&
112-
GIT_DIR=git-dir-bare.git git init
113-
) &&
109+
mkdir git-dir-bare.git &&
110+
GIT_DIR=git-dir-bare.git git init &&
114111
check_config git-dir-bare.git true unset
115112
'
116113

@@ -242,36 +239,28 @@ test_expect_success 'init rejects insanely long --template' '
242239

243240
test_expect_success 'init creates a new directory' '
244241
rm -fr newdir &&
245-
(
246-
git init newdir &&
247-
test_path_is_dir newdir/.git/refs
248-
)
242+
git init newdir &&
243+
test_path_is_dir newdir/.git/refs
249244
'
250245

251246
test_expect_success 'init creates a new bare directory' '
252247
rm -fr newdir &&
253-
(
254-
git init --bare newdir &&
255-
test_path_is_dir newdir/refs
256-
)
248+
git init --bare newdir &&
249+
test_path_is_dir newdir/refs
257250
'
258251

259252
test_expect_success 'init recreates a directory' '
260253
rm -fr newdir &&
261-
(
262-
mkdir newdir &&
263-
git init newdir &&
264-
test_path_is_dir newdir/.git/refs
265-
)
254+
mkdir newdir &&
255+
git init newdir &&
256+
test_path_is_dir newdir/.git/refs
266257
'
267258

268259
test_expect_success 'init recreates a new bare directory' '
269260
rm -fr newdir &&
270-
(
271-
mkdir newdir &&
272-
git init --bare newdir &&
273-
test_path_is_dir newdir/refs
274-
)
261+
mkdir newdir &&
262+
git init --bare newdir &&
263+
test_path_is_dir newdir/refs
275264
'
276265

277266
test_expect_success 'init creates a new deep directory' '
@@ -297,30 +286,24 @@ test_expect_success POSIXPERM 'init creates a new deep directory (umask vs. shar
297286

298287
test_expect_success 'init notices EEXIST (1)' '
299288
rm -fr newdir &&
300-
(
301-
>newdir &&
302-
test_must_fail git init newdir &&
303-
test_path_is_file newdir
304-
)
289+
>newdir &&
290+
test_must_fail git init newdir &&
291+
test_path_is_file newdir
305292
'
306293

307294
test_expect_success 'init notices EEXIST (2)' '
308295
rm -fr newdir &&
309-
(
310-
mkdir newdir &&
311-
>newdir/a
312-
test_must_fail git init newdir/a/b &&
313-
test_path_is_file newdir/a
314-
)
296+
mkdir newdir &&
297+
>newdir/a &&
298+
test_must_fail git init newdir/a/b &&
299+
test_path_is_file newdir/a
315300
'
316301

317302
test_expect_success POSIXPERM,SANITY 'init notices EPERM' '
318303
rm -fr newdir &&
319-
(
320-
mkdir newdir &&
321-
chmod -w newdir &&
322-
test_must_fail git init newdir/a/b
323-
)
304+
mkdir newdir &&
305+
chmod -w newdir &&
306+
test_must_fail git init newdir/a/b
324307
'
325308

326309
test_expect_success 'init creates a new bare directory with global --bare' '

0 commit comments

Comments
 (0)