diff options
author | Jens Lehmann <Jens.Lehmann@web.de> | 2013-10-13 13:52:05 +0200 |
---|---|---|
committer | Jonathan Nieder <jrnieder@gmail.com> | 2013-10-13 22:35:19 -0700 |
commit | 04c1ee576accad4d0a04f168b86992aba0a6727d (patch) | |
tree | 919b6501b0fc1d63389dbd3faee1739884acde60 /builtin/column.c | |
parent | mergetools/diffmerge: support DiffMerge as a git mergetool (diff) | |
download | tgif-04c1ee576accad4d0a04f168b86992aba0a6727d.tar.xz |
mv: Fix spurious warning when moving a file in presence of submodules
In commit 0656781fa "git mv" learned to update the submodule path in the
.gitmodules file when moving a submodule in the work tree. But since that
commit update_path_in_gitmodules() gets called no matter if we moved a
submodule or a regular file, which is wrong and leads to a bogus warning
when moving a regular file in a repo containing a .gitmodules file:
warning: Could not find section in .gitmodules where path=<filename>
Fix that by only calling update_path_in_gitmodules() when moving a
submodule. To achieve that, we introduce the special SUBMODULE_WITH_GITDIR
define to distinguish the cases where we also have to connect work tree
and git directory from those where we only need to update the .gitmodules
setting.
A test for submodules using a .git directory together with a .gitmodules
file has been added to t7001. Even though newer git versions will always
use a gitfile when cloning submodules, repositories cloned with older git
versions will still use this layout.
Reported-by: Matthieu Moy <Matthieu.Moy@grenoble-inp.fr>
Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Diffstat (limited to 'builtin/column.c')
0 files changed, 0 insertions, 0 deletions