--- v7
+++ v6
@@ -14,19 +14,16 @@
one entry and are the first entry of a directory with multiple
entries.
-* Add filenames adjacent to a sparse directory entry that sort before
- and after the trailing slash.
-
Later tests will take advantage of these shapes, but they also deepen
the tests that already exist.
Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
---
- t/t1092-sparse-checkout-compatibility.sh | 42 ++++++++++++++++++++++--
- 1 file changed, 40 insertions(+), 2 deletions(-)
+ t/t1092-sparse-checkout-compatibility.sh | 39 ++++++++++++++++++++++--
+ 1 file changed, 37 insertions(+), 2 deletions(-)
diff --git a/t/t1092-sparse-checkout-compatibility.sh b/t/t1092-sparse-checkout-compatibility.sh
-index ebbba044f77..363d605c209 100755
+index ebbba044f77..4a7b48e8d3f 100755
--- a/t/t1092-sparse-checkout-compatibility.sh
+++ b/t/t1092-sparse-checkout-compatibility.sh
@@ -17,7 +17,7 @@ test_expect_success 'setup' '
@@ -38,7 +35,7 @@
mkdir deep/deeper1/deepest &&
echo "after deeper1" >deep/e &&
echo "after deepest" >deep/deeper1/e &&
-@@ -25,10 +25,23 @@ test_expect_success 'setup' '
+@@ -25,10 +25,20 @@ test_expect_success 'setup' '
cp a folder2 &&
cp a x &&
cp a deep &&
@@ -52,9 +49,6 @@
+ mkdir deep/deeper1/0/0 &&
+ touch deep/deeper1/0/1 &&
+ touch deep/deeper1/0/0/0 &&
-+ >folder1- &&
-+ >folder1.x &&
-+ >folder10 &&
+ cp -r deep/deeper1/0 folder1 &&
+ cp -r deep/deeper1/0 folder2 &&
+ echo >>folder1/0/0/0 &&
@@ -62,7 +56,7 @@
git add . &&
git commit -m "initial commit" &&
git checkout -b base &&
-@@ -56,11 +69,17 @@ test_expect_success 'setup' '
+@@ -56,11 +66,17 @@ test_expect_success 'setup' '
mv folder1/a folder2/b &&
mv folder1/larger-content folder2/edited-content &&
echo >>folder2/edited-content &&
@@ -80,7 +74,7 @@
mv folder1/larger-content deep/deeper1/edited-content &&
echo >>deep/deeper1/edited-content &&
git add . &&
-@@ -68,6 +87,9 @@ test_expect_success 'setup' '
+@@ -68,6 +84,9 @@ test_expect_success 'setup' '
git checkout -b rename-in-to-out rename-base &&
mv deep/deeper1/a folder1/b &&
@@ -90,7 +84,7 @@
mv deep/deeper1/larger-content folder1/edited-content &&
echo >>folder1/edited-content &&
git add . &&
-@@ -262,13 +284,29 @@ test_expect_success 'diff --staged' '
+@@ -262,13 +281,29 @@ test_expect_success 'diff --staged' '
test_all_match git diff --staged
'