summaryrefslogtreecommitdiff
path: root/Documentation/merge-strategies.txt
diff options
context:
space:
mode:
authorJens Lehmann <Jens.Lehmann@web.de>2013-07-30 21:49:25 +0200
committerJunio C Hamano <gitster@pobox.com>2013-07-30 13:52:53 -0700
commit11502468287fdd62a22c43766881d21ab4fcf31c (patch)
treee09ccd628aee632890810c670c0bff8056e0a860 /Documentation/merge-strategies.txt
parent4838c81fabc2bab7ff5cd95135060d9a580ad742 (diff)
downloadgit-11502468287fdd62a22c43766881d21ab4fcf31c.tar.gz
mv: move submodules together with their work trees
Currently the attempt to use "git mv" on a submodule errors out with: fatal: source directory is empty, source=<src>, destination=<dest> The reason is that mv searches for the submodule with a trailing slash in the index, which it doesn't find (because it is stored without a trailing slash). As it doesn't find any index entries inside the submodule it claims the directory would be empty even though it isn't. Fix that by searching for the name without a trailing slash and continue if it is a submodule. Then rename() will move the submodule work tree just like it moves a file. Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/merge-strategies.txt')
0 files changed, 0 insertions, 0 deletions