]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'ld/sparse-diff-blame'
authorJunio C Hamano <gitster@pobox.com>
Tue, 21 Dec 2021 23:03:17 +0000 (15:03 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 21 Dec 2021 23:03:17 +0000 (15:03 -0800)
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

1  2 
builtin/blame.c
git.c
t/t1092-sparse-checkout-compatibility.sh

diff --cc builtin/blame.c
Simple merge
diff --cc git.c
Simple merge