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

mv: split submodule move preparation code out

Browse Source 
"Huh?" is removed from die() message.

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Nguyễn Thái Ngọc Duy 2014-08-10 09:29:31 +07:00 committed by Junio C Hamano
parent ad1a19d0e7
commit 3af05a6d0d
1 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
builtin/mv.c
View File

@ -61,6 +61,23 @@ static const char *add_slash(const char *path)
static struct lock_file lock_file; static struct lock_file lock_file;
#define SUBMODULE_WITH_GITDIR ((const char *)1) #define SUBMODULE_WITH_GITDIR ((const char *)1)
static void prepare_move_submodule(const char *src, int first,
const char **submodule_gitfile)
{
struct strbuf submodule_dotgit = STRBUF_INIT;
if (!S_ISGITLINK(active_cache[first]->ce_mode))
die(_("Directory %s is in index and no submodule?"), src);
if (!is_staging_gitmodules_ok())
die(_("Please stage your changes to .gitmodules or stash them to proceed"));
strbuf_addf(&submodule_dotgit, "%s/.git", src);
*submodule_gitfile = read_gitfile(submodule_dotgit.buf);
if (*submodule_gitfile)
*submodule_gitfile = xstrdup(*submodule_gitfile);
else
*submodule_gitfile = SUBMODULE_WITH_GITDIR;
strbuf_release(&submodule_dotgit);
}
int cmd_mv(int argc, const char **argv, const char *prefix) int cmd_mv(int argc, const char **argv, const char *prefix)
{ {
int i, gitmodules_modified = 0; int i, gitmodules_modified = 0;
@ -132,20 +149,11 @@ int cmd_mv(int argc, const char **argv, const char *prefix)
bad = _("cannot move directory over file"); bad = _("cannot move directory over file");
else if (src_is_dir) { else if (src_is_dir) {
int first = cache_name_pos(src, length); int first = cache_name_pos(src, length);
if (first >= 0) {
struct strbuf submodule_dotgit = STRBUF_INIT; if (first >= 0)
if (!S_ISGITLINK(active_cache[first]->ce_mode)) prepare_move_submodule(src, first,
die (_("Huh? Directory %s is in index and no submodule?"), src); submodule_gitfile + i);
if (!is_staging_gitmodules_ok()) else {
die (_("Please, stage your changes to .gitmodules or stash them to proceed"));
strbuf_addf(&submodule_dotgit, "%s/.git", src);
submodule_gitfile[i] = read_gitfile(submodule_dotgit.buf);
if (submodule_gitfile[i])
submodule_gitfile[i] = xstrdup(submodule_gitfile[i]);
else
submodule_gitfile[i] = SUBMODULE_WITH_GITDIR;
strbuf_release(&submodule_dotgit);
} else {
const char *src_w_slash = add_slash(src); const char *src_w_slash = add_slash(src);
int last, len_w_slash = length + 1; int last, len_w_slash = length + 1;