diff options
author | Manish Goregaokar <manishsmail@gmail.com> | 2019-11-25 07:15:44 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2019-11-25 08:08:25 +0300 |
commit | 1f3aea22c781d603d56ce794879a8fe8d8dd77d1 (patch) | |
tree | 2885e4bdb247daa8a8e8227cc1c433c943821a04 /git-mergetool.sh | |
parent | 5fa0f5238b0cd46cfe7f6fa76c3f526ea98148d9 (diff) |
submodule: fix 'submodule status' when called from a subdirectory
When calling `git submodule status` while in a subdirectory, we are
incorrectly not detecting modified submodules and
thus reporting that all of the submodules are unchanged.
This is because the submodule helper is calling `diff-index` with the
submodule path assuming the path is relative to the current prefix
directory, however the submodule path used is actually relative to the root.
Always pass NULL as the `prefix` when running diff-files on the
submodule, to make sure the submodule's path is interpreted as relative
to the superproject's repository root.
Signed-off-by: Manish Goregaokar <manishsmail@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-mergetool.sh')
0 files changed, 0 insertions, 0 deletions