Since the inspect() helper in the submodule-basic test suite was
written, 'git -C <dir>' was added. By using -C, we no longer need a
reference to the base directory for the test. This simplifies callsites,
and will make the addition of other arguments in later patches more
readable.
Signed-off-by: Emily Shaffer <emilyshaffer@xxxxxxxxxx>
---
t/t7400-submodule-basic.sh | 40 +++++++++++++++-----------------------
1 file changed, 16 insertions(+), 24 deletions(-)
diff --git a/t/t7400-submodule-basic.sh b/t/t7400-submodule-basic.sh
index cb1b8e35db..d69a5c0032 100755
--- a/t/t7400-submodule-basic.sh
+++ b/t/t7400-submodule-basic.sh
@@ -107,23 +107,15 @@ test_expect_success 'setup - repository to add submodules to' '
# generates, which will expand symbolic links.
submodurl=$(pwd -P)
-listbranches() {
- git for-each-ref --format='%(refname)' 'refs/heads/*'
-}
-
inspect() {
- dir=$1 &&
- dotdot="${2:-..}" &&
-
- (
- cd "$dir" &&
- listbranches >"$dotdot/heads" &&
- { git symbolic-ref HEAD || :; } >"$dotdot/head" &&
- git rev-parse HEAD >"$dotdot/head-sha1" &&
- git update-index --refresh &&
- git diff-files --exit-code &&
- git clean -n -d -x >"$dotdot/untracked"
- )
+ sub_dir=$1 &&
+
+ git -C "$sub_dir" for-each-ref --format='%(refname)' 'refs/heads/*' >heads &&
+ { git -C "$sub_dir" symbolic-ref HEAD || :; } >head &&
+ git -C "$sub_dir" rev-parse HEAD >head-sha1 &&
+ git -C "$sub_dir" update-index --refresh &&
+ git -C "$sub_dir" diff-files --exit-code &&
+ git -C "$sub_dir" clean -n -d -x >untracked
}
test_expect_success 'submodule add' '
@@ -146,7 +138,7 @@ test_expect_success 'submodule add' '
) &&
rm -f heads head untracked &&
- inspect addtest/submod ../.. &&
+ inspect addtest/submod &&
test_cmp expect heads &&
test_cmp expect head &&
test_must_be_empty untracked
@@ -248,7 +240,7 @@ test_expect_success 'submodule add --branch' '
) &&
rm -f heads head untracked &&
- inspect addtest/submod-branch ../.. &&
+ inspect addtest/submod-branch &&
test_cmp expect-heads heads &&
test_cmp expect-head head &&
test_must_be_empty untracked
@@ -264,7 +256,7 @@ test_expect_success 'submodule add with ./ in path' '
) &&
rm -f heads head untracked &&
- inspect addtest/dotsubmod/frotz ../../.. &&
+ inspect addtest/dotsubmod/frotz &&
test_cmp expect heads &&
test_cmp expect head &&
test_must_be_empty untracked
@@ -280,7 +272,7 @@ test_expect_success 'submodule add with /././ in path' '
) &&
rm -f heads head untracked &&
- inspect addtest/dotslashdotsubmod/frotz ../../.. &&
+ inspect addtest/dotslashdotsubmod/frotz &&
test_cmp expect heads &&
test_cmp expect head &&
test_must_be_empty untracked
@@ -296,7 +288,7 @@ test_expect_success 'submodule add with // in path' '
) &&
rm -f heads head untracked &&
- inspect addtest/slashslashsubmod/frotz ../../.. &&
+ inspect addtest/slashslashsubmod/frotz &&
test_cmp expect heads &&
test_cmp expect head &&
test_must_be_empty untracked
@@ -312,7 +304,7 @@ test_expect_success 'submodule add with /.. in path' '
) &&
rm -f heads head untracked &&
- inspect addtest/realsubmod ../.. &&
+ inspect addtest/realsubmod &&
test_cmp expect heads &&
test_cmp expect head &&
test_must_be_empty untracked
@@ -328,7 +320,7 @@ test_expect_success 'submodule add with ./, /.. and // in path' '
) &&
rm -f heads head untracked &&
- inspect addtest/realsubmod2 ../.. &&
+ inspect addtest/realsubmod2 &&
test_cmp expect heads &&
test_cmp expect head &&
test_must_be_empty untracked
@@ -359,7 +351,7 @@ test_expect_success 'submodule add in subdirectory' '
) &&
rm -f heads head untracked &&
- inspect addtest/realsubmod3 ../.. &&
+ inspect addtest/realsubmod3 &&
test_cmp expect heads &&
test_cmp expect head &&
test_must_be_empty untracked
--
2.34.0.rc1.387.gb447b232ab-goog
