diff options
author | Junio C Hamano <gitster@pobox.com> | 2021-01-25 22:19:18 (GMT) |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2021-01-25 22:19:18 (GMT) |
commit | 080627942802e767b068a491f3d349227f4e2cdc (patch) | |
tree | e229ae62bfe315afc0d784b3752958f981b46d96 /diff.h | |
parent | dfcd90506998c1de8d8ef86431c86ef9ed626c30 (diff) | |
parent | 8ef93124645f89c45c9ec3edd3b268b38154061a (diff) | |
download | git-080627942802e767b068a491f3d349227f4e2cdc.zip git-080627942802e767b068a491f3d349227f4e2cdc.tar.gz git-080627942802e767b068a491f3d349227f4e2cdc.tar.bz2 |
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 'diff.h')
-rw-r--r-- | diff.h | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -178,6 +178,7 @@ struct diff_flags { unsigned diff_from_contents; unsigned dirty_submodules; unsigned ignore_untracked_in_submodules; + unsigned ignore_submodule_set; unsigned ignore_dirty_submodules; unsigned override_submodule_config; unsigned dirstat_by_line; |