--- v3
+++ v2
@@ -6,14 +6,14 @@
Signed-off-by: Emily Shaffer <emilyshaffer@google.com>
---
- t/t7400-submodule-basic.sh | 36 ++++++++++++++----------------------
- 1 file changed, 14 insertions(+), 22 deletions(-)
+ t/t7400-submodule-basic.sh | 37 +++++++++++++++----------------------
+ 1 file changed, 15 insertions(+), 22 deletions(-)
diff --git a/t/t7400-submodule-basic.sh b/t/t7400-submodule-basic.sh
-index a924fdb7a6..4bc6b6c886 100755
+index a924fdb7a6..f5dc051a6e 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' '
+@@ -107,25 +107,18 @@ test_expect_success 'setup - repository to add submodules to' '
# generates, which will expand symbolic links.
submodurl=$(pwd -P)
@@ -42,8 +42,11 @@
+ git -C "$dir" clean -n -d -x >untracked
}
++
test_expect_success 'submodule add' '
-@@ -146,7 +138,7 @@ test_expect_success 'submodule add' '
+ echo "refs/heads/main" >expect &&
+
+@@ -146,7 +139,7 @@ test_expect_success 'submodule add' '
) &&
rm -f heads head untracked &&
@@ -52,7 +55,7 @@
test_cmp expect heads &&
test_cmp expect head &&
test_must_be_empty untracked
-@@ -237,7 +229,7 @@ test_expect_success 'submodule add --branch' '
+@@ -237,7 +230,7 @@ test_expect_success 'submodule add --branch' '
) &&
rm -f heads head untracked &&
@@ -61,7 +64,7 @@
test_cmp expect-heads heads &&
test_cmp expect-head head &&
test_must_be_empty untracked
-@@ -253,7 +245,7 @@ test_expect_success 'submodule add with ./ in path' '
+@@ -253,7 +246,7 @@ test_expect_success 'submodule add with ./ in path' '
) &&
rm -f heads head untracked &&
@@ -70,7 +73,7 @@
test_cmp expect heads &&
test_cmp expect head &&
test_must_be_empty untracked
-@@ -269,7 +261,7 @@ test_expect_success 'submodule add with /././ in path' '
+@@ -269,7 +262,7 @@ test_expect_success 'submodule add with /././ in path' '
) &&
rm -f heads head untracked &&
@@ -79,7 +82,7 @@
test_cmp expect heads &&
test_cmp expect head &&
test_must_be_empty untracked
-@@ -285,7 +277,7 @@ test_expect_success 'submodule add with // in path' '
+@@ -285,7 +278,7 @@ test_expect_success 'submodule add with // in path' '
) &&
rm -f heads head untracked &&
@@ -88,7 +91,7 @@
test_cmp expect heads &&
test_cmp expect head &&
test_must_be_empty untracked
-@@ -301,7 +293,7 @@ test_expect_success 'submodule add with /.. in path' '
+@@ -301,7 +294,7 @@ test_expect_success 'submodule add with /.. in path' '
) &&
rm -f heads head untracked &&
@@ -97,7 +100,7 @@
test_cmp expect heads &&
test_cmp expect head &&
test_must_be_empty untracked
-@@ -317,7 +309,7 @@ test_expect_success 'submodule add with ./, /.. and // in path' '
+@@ -317,7 +310,7 @@ test_expect_success 'submodule add with ./, /.. and // in path' '
) &&
rm -f heads head untracked &&
@@ -106,7 +109,7 @@
test_cmp expect heads &&
test_cmp expect head &&
test_must_be_empty untracked
-@@ -348,7 +340,7 @@ test_expect_success 'submodule add in subdirectory' '
+@@ -348,7 +341,7 @@ test_expect_success 'submodule add in subdirectory' '
) &&
rm -f heads head untracked &&
@@ -116,5 +119,5 @@
test_cmp expect head &&
test_must_be_empty untracked
--
-2.33.0.rc2.250.ged5fa647cd-goog
+2.32.0.272.g935e593368-goog