From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 21 Dec 2021 23:03:17 +0000 (-0800)
Subject: Merge branch 'ld/sparse-diff-blame'
X-Git-Tag: v2.35.0-rc0~57
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8d2c37320bd01bbce4b88365c160bc4a542bee48;p=thirdparty%2Fgit.git

Merge branch 'ld/sparse-diff-blame'

Teach diff and blame to work well with sparse index.

* ld/sparse-diff-blame:
  blame: enable and test the sparse index
  diff: enable and test the sparse index
  diff: replace --staged with --cached in t1092 tests
  repo-settings: prepare_repo_settings only in git repos
  test-read-cache: set up repo after git directory
  commit-graph: return if there is no git directory
  git: ensure correct git directory setup with -h
---

8d2c37320bd01bbce4b88365c160bc4a542bee48