--- v4
+++ v8
@@ -1,57 +1,27 @@
From: Derrick Stolee <dstolee@microsoft.com>
-As more features integrate with the sparse-index feature, more and more
-special cases arise that require different data shapes within the tree
-structure of the repository in order to demonstrate those cases.
-
-Add several interesting special cases all at once instead of sprinkling
-them across several commits. The interesting cases being added here are:
-
-* Add sparse-directory entries on both sides of directories within the
- sparse-checkout definition.
-
-* Add directories outside the sparse-checkout definition who have only
- one entry and are the first entry of a directory with multiple
- entries.
-
-Later tests will take advantage of these shapes, but they also deepen
-the tests that already exist.
+This fixes the test data shape to be as expected, allowing rename
+detection to work properly now that the 'larger-content' file actually
+has meaningful lines.
Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
---
- t/t1092-sparse-checkout-compatibility.sh | 8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
+ t/t1092-sparse-checkout-compatibility.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/t/t1092-sparse-checkout-compatibility.sh b/t/t1092-sparse-checkout-compatibility.sh
-index 4f2f09b53a32..98257695979a 100755
+index b8617ceef71..87f1014a1c9 100755
--- a/t/t1092-sparse-checkout-compatibility.sh
+++ b/t/t1092-sparse-checkout-compatibility.sh
-@@ -17,7 +17,7 @@ test_expect_success 'setup' '
- echo "after folder1" >g &&
- echo "after x" >z &&
- mkdir folder1 folder2 deep x &&
-- mkdir deep/deeper1 deep/deeper2 &&
-+ mkdir deep/deeper1 deep/deeper2 deep/before deep/later &&
- mkdir deep/deeper1/deepest &&
- echo "after deeper1" >deep/e &&
- echo "after deepest" >deep/deeper1/e &&
-@@ -25,10 +25,16 @@ test_expect_success 'setup' '
- cp a folder2 &&
- cp a x &&
- cp a deep &&
-+ cp a deep/before &&
- cp a deep/deeper1 &&
- cp a deep/deeper2 &&
-+ cp a deep/later &&
- cp a deep/deeper1/deepest &&
- cp -r deep/deeper1/deepest deep/deeper2 &&
-+ mkdir deep/deeper1/0 &&
-+ mkdir deep/deeper1/0/0 &&
-+ touch deep/deeper1/0/1 &&
-+ touch deep/deeper1/0/0/0 &&
- git add . &&
- git commit -m "initial commit" &&
- git checkout -b base &&
+@@ -40,7 +40,7 @@ test_expect_success 'setup' '
+ done &&
+
+ git checkout -b rename-base base &&
+- echo >folder1/larger-content <<-\EOF &&
++ cat >folder1/larger-content <<-\EOF &&
+ matching
+ lines
+ help
--
gitgitgadget