From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 13 Jun 2022 22:53:41 +0000 (-0700)
Subject: Merge branch 'pb/range-diff-with-submodule'
X-Git-Tag: v2.37.0-rc0~11
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ecbd60ae9980cb3f30f54270f39b464c1f8b39a2;p=thirdparty%2Fgit.git

Merge branch 'pb/range-diff-with-submodule'

"git -c diff.submodule=log range-diff" did not show anything for
submodules that changed in the ranges being compared, and
"git -c diff.submodule=diff range-diff" did not work correctly.
Fix this by including the "--submodule=short" output
unconditionally to be compared.

* pb/range-diff-with-submodule:
  range-diff: show submodule changes irrespective of diff.submodule
---

ecbd60ae9980cb3f30f54270f39b464c1f8b39a2