author | Jens Lehmann <Jens.Lehmann@web.de> | |
Thu, 4 Mar 2010 21:20:33 +0000 (22:20 +0100) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Fri, 5 Mar 2010 06:16:33 +0000 (22:16 -0800) | ||
commit | c7e1a73641e24340bf93f6f1792220fa9154cda3 | |
tree | d414fd7b961223be35decfc3038342d63f2f4223 | tree | snapshot |
parent | 5ce9086ddfe6931ef34fcd99778c9235e2ee1839 | commit | diff |
git diff --submodule: Show detailed dirty status of submodules
When encountering a dirty submodule while doing "git diff --submodule"
print an extra line for new untracked content and another for modified
but already tracked content. And if the HEAD of the submodule is equal
to the ref diffed against in the superproject, drop the output which
would just show the same SHA1s and no commit message headlines.
To achieve that, the dirty_submodule bitfield is expanded to two bits.
The output of "git status" inside the submodule is parsed to set the
according bits.
Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
When encountering a dirty submodule while doing "git diff --submodule"
print an extra line for new untracked content and another for modified
but already tracked content. And if the HEAD of the submodule is equal
to the ref diffed against in the superproject, drop the output which
would just show the same SHA1s and no commit message headlines.
To achieve that, the dirty_submodule bitfield is expanded to two bits.
The output of "git status" inside the submodule is parsed to set the
according bits.
Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
diff-lib.c | diff | blob | history | |
diffcore.h | diff | blob | history | |
submodule.c | diff | blob | history | |
submodule.h | diff | blob | history | |
t/t4041-diff-submodule.sh | diff | blob | history |