]> git.ipfire.org Git - thirdparty/git.git/commit
Merge branch 'sj/untracked-files-in-submodule-directory-is-not-dirty'
authorJunio C Hamano <gitster@pobox.com>
Mon, 25 Jan 2021 22:19:18 +0000 (14:19 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 25 Jan 2021 22:19:18 +0000 (14:19 -0800)
commit080627942802e767b068a491f3d349227f4e2cdc
treee229ae62bfe315afc0d784b3752958f981b46d96
parentdfcd90506998c1de8d8ef86431c86ef9ed626c30
parent8ef93124645f89c45c9ec3edd3b268b38154061a
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"
diff.c
diff.h
submodule.c
t/t3701-add-interactive.sh
wt-status.c