]> git.ipfire.org Git - thirdparty/git.git/commitdiff
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)
"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"

1  2 
diff.c
diff.h
submodule.c
t/t3701-add-interactive.sh
wt-status.c

diff --cc diff.c
Simple merge
diff --cc diff.h
Simple merge
diff --cc submodule.c
Simple merge
Simple merge
diff --cc wt-status.c
Simple merge