Merge branch 'ds/sparse-index-protections'

Builds on top of the sparse-index infrastructure to mark operations
that are not ready to mark with the sparse index, causing them to
fall back on fully-populated index that they always have worked with.

* ds/sparse-index-protections: (47 commits)
  name-hash: use expand_to_path()
  sparse-index: expand_to_path()
  name-hash: don't add directories to name_hash
  revision: ensure full index
  resolve-undo: ensure full index
  read-cache: ensure full index
  pathspec: ensure full index
  merge-recursive: ensure full index
  entry: ensure full index
  dir: ensure full index
  update-index: ensure full index
  stash: ensure full index
  rm: ensure full index
  merge-index: ensure full index
  ls-files: ensure full index
  grep: ensure full index
  fsck: ensure full index
  difftool: ensure full index
  commit: ensure full index
  checkout: ensure full index
  ...

1 files changed, 1 insertions, 1 deletions

diff --git a/merge-ort.c b/merge-ort.c
index b1795d838e..6c2792b10e 100644
--- a/merge-ort.c
+++ b/merge-ort.c
@@ -2564,7 +2564,7 @@ static int blob_unchanged(struct merge_options *opt,
 	struct strbuf basebuf = STRBUF_INIT;
 	struct strbuf sidebuf = STRBUF_INIT;
 	int ret = 0; /* assume changed for safety */
-	const struct index_state *idx = &opt->priv->attr_index;
+	struct index_state *idx = &opt->priv->attr_index;
 
 	if (!idx->initialized)
 		initialize_attr_index(opt);