undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mv: move submodules together with their work trees

Browse Source 
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>
This commit is contained in:
Jens Lehmann 2013-07-30 21:49:25 +02:00 committed by Junio C Hamano
parent 4838c81fab
commit 1150246828
2 changed files with 81 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

89
builtin/mv.c
View File

@ -118,55 +118,60 @@ int cmd_mv(int argc, const char **argv, const char *prefix)
&& lstat(dst, &st) == 0) && lstat(dst, &st) == 0)
bad = _("cannot move directory over file"); bad = _("cannot move directory over file");
else if (src_is_dir) { else if (src_is_dir) {
const char *src_w_slash = add_slash(src); int first = cache_name_pos(src, length);
int len_w_slash = length + 1; if (first >= 0) {
int first, last; if (!S_ISGITLINK(active_cache[first]->ce_mode))
die (_("Huh? Directory %s is in index and no submodule?"), src);
} else {
const char *src_w_slash = add_slash(src);
int last, len_w_slash = length + 1;
modes[i] = WORKING_DIRECTORY; modes[i] = WORKING_DIRECTORY;
first = cache_name_pos(src_w_slash, len_w_slash); first = cache_name_pos(src_w_slash, len_w_slash);
if (first >= 0) if (first >= 0)
die (_("Huh? %.*s is in index?"), die (_("Huh? %.*s is in index?"),
len_w_slash, src_w_slash); len_w_slash, src_w_slash);
first = -1 - first; first = -1 - first;
for (last = first; last < active_nr; last++) { for (last = first; last < active_nr; last++) {
const char *path = active_cache[last]->name; const char *path = active_cache[last]->name;
if (strncmp(path, src_w_slash, len_w_slash)) if (strncmp(path, src_w_slash, len_w_slash))
break; break;
}
free((char *)src_w_slash);
if (last - first < 1)
bad = _("source directory is empty");
else {
int j, dst_len;
if (last - first > 0) {
source = xrealloc(source,
(argc + last - first)
* sizeof(char *));
destination = xrealloc(destination,
(argc + last - first)
* sizeof(char *));
modes = xrealloc(modes,
(argc + last - first)
* sizeof(enum update_mode));
} }
free((char *)src_w_slash);
dst = add_slash(dst); if (last - first < 1)
dst_len = strlen(dst); bad = _("source directory is empty");
else {
int j, dst_len;
for (j = 0; j < last - first; j++) { if (last - first > 0) {
const char *path = source = xrealloc(source,
active_cache[first + j]->name; (argc + last - first)
source[argc + j] = path; * sizeof(char *));
destination[argc + j] = destination = xrealloc(destination,
prefix_path(dst, dst_len, (argc + last - first)
path + length + 1); * sizeof(char *));
modes[argc + j] = INDEX; modes = xrealloc(modes,
(argc + last - first)
* sizeof(enum update_mode));
}
dst = add_slash(dst);
dst_len = strlen(dst);
for (j = 0; j < last - first; j++) {
const char *path =
active_cache[first + j]->name;
source[argc + j] = path;
destination[argc + j] =
prefix_path(dst, dst_len,
path + length + 1);
modes[argc + j] = INDEX;
}
argc += last - first;
} }
argc += last - first;
} }
} else if (cache_name_pos(src, length) < 0) } else if (cache_name_pos(src, length) < 0)
bad = _("not under version control"); bad = _("not under version control");

34
t/t7001-mv.sh
View File

@ -259,4 +259,38 @@ test_expect_success SYMLINKS 'check moved symlink' '
rm -f moved symlink rm -f moved symlink
test_expect_success 'setup submodule' '
git commit -m initial &&
git reset --hard &&
git submodule add ./. sub &&
echo content >file &&
git add file &&
git commit -m "added sub and file"
'
test_expect_success 'git mv cannot move a submodule in a file' '
test_must_fail git mv sub file
'
test_expect_success 'git mv moves a submodule with a .git directory and no .gitmodules' '
entry="$(git ls-files --stage sub | cut -f 1)" &&
git rm .gitmodules &&
(
cd sub &&
rm -f .git &&
cp -a ../.git/modules/sub .git &&
GIT_WORK_TREE=. git config --unset core.worktree
) &&
mkdir mod &&
git mv sub mod/sub &&
! test -e sub &&
[ "$entry" = "$(git ls-files --stage mod/sub | cut -f 1)" ] &&
(
cd mod/sub &&
git status
) &&
git update-index --refresh &&
git diff-files --quiet
'
test_done test_done