From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 25 Jan 2021 22:19:18 +0000 (-0800)
Subject: Merge branch 'sj/untracked-files-in-submodule-directory-is-not-dirty'
X-Git-Tag: v2.31.0-rc0~104
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=080627942802e767b068a491f3d349227f4e2cdc;p=thirdparty%2Fgit.git

Merge branch 'sj/untracked-files-in-submodule-directory-is-not-dirty'

"git diff" showed a submodule working tree with untracked cruft as
"Submodule commit <objectname>-dirty", but a natural expectation is
that the "-dirty" indicator would align with "git describe --dirty",
which does not consider having untracked files in the working tree
as source of dirtiness.  The inconsistency has been fixed.

* sj/untracked-files-in-submodule-directory-is-not-dirty:
  diff: do not show submodule with untracked files as "-dirty"
---

080627942802e767b068a491f3d349227f4e2cdc