Merge branch 'jk/diff-memuse-optim-with-stat-unmatch'
authorJunio C Hamano <gitster@pobox.com>
Thu, 18 Jun 2020 04:54:00 +0000 (21:54 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 18 Jun 2020 04:54:00 +0000 (21:54 -0700)
commit0cd0afc9c6193dd4a762f5a2d1bc23e58629b23f
tree092f30dc03f30dbc6875dabbeee644ab4df2ee65
parenteebb51ba8cab97c0b3f3f18eaab7796803b8494b
parentd2d7fbe12945dd9032c9c7c14a4563dbecc7e629
Merge branch 'jk/diff-memuse-optim-with-stat-unmatch'

Reduce memory usage during "diff --quiet" in a worktree with too
many stat-unmatched paths.

* jk/diff-memuse-optim-with-stat-unmatch:
  diff: discard blob data from stat-unmatched pairs
diff.c