--- v8
+++ v5
@@ -31,10 +31,10 @@
  2 files changed, 40 insertions(+)
 
 diff --git a/sparse-index.c b/sparse-index.c
-index affc4048f27..2c695930275 100644
+index 6f21397e2ee0..1b49898d0cb7 100644
 --- a/sparse-index.c
 +++ b/sparse-index.c
-@@ -116,6 +116,17 @@ int set_sparse_index_config(struct repository *repo, int enable)
+@@ -125,6 +125,17 @@ int set_sparse_index_config(struct repository *repo, int enable)
  	return res;
  }
  
@@ -52,7 +52,7 @@
  int convert_to_sparse(struct index_state *istate)
  {
  	int test_env;
-@@ -152,6 +163,13 @@ int convert_to_sparse(struct index_state *istate)
+@@ -161,6 +172,13 @@ int convert_to_sparse(struct index_state *istate)
  		return -1;
  	}
  
@@ -67,7 +67,7 @@
  		warning(_("unable to update cache-tree, staying full"));
  		return -1;
 diff --git a/t/t1092-sparse-checkout-compatibility.sh b/t/t1092-sparse-checkout-compatibility.sh
-index d028b73eba1..b8617ceef71 100755
+index 12e6c453024f..4f2f09b53a32 100755
 --- a/t/t1092-sparse-checkout-compatibility.sh
 +++ b/t/t1092-sparse-checkout-compatibility.sh
 @@ -352,6 +352,28 @@ test_expect_success 'merge with outside renames' '