diff options
author | Junio C Hamano <gitster@pobox.com> | 2021-01-25 14:19:18 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2021-01-25 14:19:18 -0800 |
commit | 080627942802e767b068a491f3d349227f4e2cdc (patch) | |
tree | e229ae62bfe315afc0d784b3752958f981b46d96 /t/t5100/info0006 | |
parent | Merge branch 'jc/deprecate-pack-redundant' (diff) | |
parent | diff: do not show submodule with untracked files as "-dirty" (diff) | |
download | tgif-080627942802e767b068a491f3d349227f4e2cdc.tar.xz |
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"
Diffstat (limited to 't/t5100/info0006')
0 files changed, 0 insertions, 0 deletions