]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'ds/sparse-colon-path'
authorJunio C Hamano <gitster@pobox.com>
Fri, 20 May 2022 22:26:58 +0000 (15:26 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 20 May 2022 22:26:58 +0000 (15:26 -0700)
"git show :<path>" learned to work better with the sparse-index
feature.

* ds/sparse-colon-path:
  rev-parse: integrate with sparse index
  object-name: diagnose trees in index properly
  object-name: reject trees found in the index
  show: integrate with the sparse index
  t1092: add compatibility tests for 'git show'

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

diff --cc builtin/log.c
Simple merge