diff options
author | Jens Lehmann <Jens.Lehmann@web.de> | 2013-08-06 21:15:11 +0200 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2013-08-06 14:10:35 -0700 |
commit | 0656781fadca17cc51fb1c30f265c251ebe12819 (patch) | |
tree | fb523dbf6f695b22ecd39809c18ded669da0715f /t/t4013/diff.whatchanged_-SF_-p_master | |
parent | submodule.c: add .gitmodules staging helper functions (diff) | |
download | tgif-0656781fadca17cc51fb1c30f265c251ebe12819.tar.xz |
mv: update the path entry in .gitmodules for moved submodules
Currently using "git mv" on a submodule moves the submodule's work tree in
that of the superproject. But the submodule's path setting in .gitmodules
is left untouched, which is now inconsistent with the work tree and makes
git commands that rely on the proper path -> name mapping (like status and
diff) behave strangely.
Let "git mv" help here by not only moving the submodule's work tree but
also updating the "submodule.<submodule name>.path" setting from the
.gitmodules file and stage both. This doesn't happen when no .gitmodules
file is found and only issues a warning when it doesn't have a section for
this submodule. This is because the user might just use plain gitlinks
without the .gitmodules file or has already updated the path setting by
hand before issuing the "git mv" command (in which case the warning
reminds him that mv would have done that for him). Only when .gitmodules
is found and contains merge conflicts the mv command will fail and tell
the user to resolve the conflict before trying again.
Also extend the man page to inform the user about this new feature.
Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4013/diff.whatchanged_-SF_-p_master')
0 files changed, 0 insertions, 0 deletions