submodule: check for unstaged .gitmodules outside of config parsing
[git/git.git] / builtin / mv.c
CommitLineData
11be42a4
JS
1/*
2 * "git mv" builtin command
3 *
4 * Copyright (C) 2006 Johannes Schindelin
5 */
11be42a4 6#include "builtin.h"
b2141fc1 7#include "config.h"
2ec87741 8#include "pathspec.h"
697cc8ef 9#include "lockfile.h"
11be42a4
JS
10#include "dir.h"
11#include "cache-tree.h"
c455c87c 12#include "string-list.h"
c7a20c11 13#include "parse-options.h"
a88c915d 14#include "submodule.h"
11be42a4 15
c7a20c11 16static const char * const builtin_mv_usage[] = {
9c9b4f2f 17 N_("git mv [<options>] <source>... <destination>"),
c7a20c11
PH
18 NULL
19};
11be42a4 20
c57f6281
MM
21#define DUP_BASENAME 1
22#define KEEP_TRAILING_SLASH 2
23
2ec87741
BW
24static const char **internal_prefix_pathspec(const char *prefix,
25 const char **pathspec,
26 int count, unsigned flags)
11be42a4 27{
d78b0f3d 28 int i;
b32fa95f 29 const char **result;
2ec87741 30 int prefixlen = prefix ? strlen(prefix) : 0;
b32fa95f 31 ALLOC_ARRAY(result, count + 1);
2ec87741
BW
32
33 /* Create an intermediate copy of the pathspec based on the flags */
d78b0f3d 34 for (i = 0; i < count; i++) {
2ec87741 35 int length = strlen(pathspec[i]);
af82559b 36 int to_copy = length;
2ec87741 37 char *it;
c57f6281 38 while (!(flags & KEEP_TRAILING_SLASH) &&
2ec87741 39 to_copy > 0 && is_dir_sep(pathspec[i][to_copy - 1]))
af82559b 40 to_copy--;
2ec87741
BW
41
42 it = xmemdupz(pathspec[i], to_copy);
43 if (flags & DUP_BASENAME) {
44 result[i] = xstrdup(basename(it));
45 free(it);
46 } else {
47 result[i] = it;
af82559b 48 }
11be42a4 49 }
2ec87741
BW
50 result[count] = NULL;
51
52 /* Prefix the pathspec and free the old intermediate strings */
53 for (i = 0; i < count; i++) {
54 const char *match = prefix_path(prefix, prefixlen, result[i]);
55 free((char *) result[i]);
56 result[i] = match;
57 }
58
59 return result;
11be42a4
JS
60}
61
ac64a722
JS
62static const char *add_slash(const char *path)
63{
50a6c8ef 64 size_t len = strlen(path);
ac64a722 65 if (path[len - 1] != '/') {
50a6c8ef 66 char *with_slash = xmalloc(st_add(len, 2));
ac64a722 67 memcpy(with_slash, path, len);
329a3047
JH
68 with_slash[len++] = '/';
69 with_slash[len] = 0;
ac64a722
JS
70 return with_slash;
71 }
72 return path;
73}
74
11be42a4 75static struct lock_file lock_file;
04c1ee57 76#define SUBMODULE_WITH_GITDIR ((const char *)1)
11be42a4 77
3af05a6d
NTND
78static void prepare_move_submodule(const char *src, int first,
79 const char **submodule_gitfile)
80{
81 struct strbuf submodule_dotgit = STRBUF_INIT;
82 if (!S_ISGITLINK(active_cache[first]->ce_mode))
83 die(_("Directory %s is in index and no submodule?"), src);
91b83480 84 if (!is_staging_gitmodules_ok(&the_index))
3af05a6d
NTND
85 die(_("Please stage your changes to .gitmodules or stash them to proceed"));
86 strbuf_addf(&submodule_dotgit, "%s/.git", src);
87 *submodule_gitfile = read_gitfile(submodule_dotgit.buf);
88 if (*submodule_gitfile)
89 *submodule_gitfile = xstrdup(*submodule_gitfile);
90 else
91 *submodule_gitfile = SUBMODULE_WITH_GITDIR;
92 strbuf_release(&submodule_dotgit);
93}
94
e2b6cfa0
NTND
95static int index_range_of_same_dir(const char *src, int length,
96 int *first_p, int *last_p)
97{
98 const char *src_w_slash = add_slash(src);
99 int first, last, len_w_slash = length + 1;
100
101 first = cache_name_pos(src_w_slash, len_w_slash);
102 if (first >= 0)
103 die(_("%.*s is in index"), len_w_slash, src_w_slash);
104
105 first = -1 - first;
106 for (last = first; last < active_nr; last++) {
107 const char *path = active_cache[last]->name;
108 if (strncmp(path, src_w_slash, len_w_slash))
109 break;
110 }
111 if (src_w_slash != src)
112 free((char *)src_w_slash);
113 *first_p = first;
114 *last_p = last;
115 return last - first;
116}
117
7061cf0f 118int cmd_mv(int argc, const char **argv, const char *prefix)
11be42a4 119{
189d035e 120 int i, flags, gitmodules_modified = 0;
11be42a4 121 int verbose = 0, show_only = 0, force = 0, ignore_errors = 0;
c7a20c11 122 struct option builtin_mv_options[] = {
6c54dc46
NTND
123 OPT__VERBOSE(&verbose, N_("be verbose")),
124 OPT__DRY_RUN(&show_only, N_("dry run")),
125 OPT__FORCE(&force, N_("force move/rename even if target exists")),
d5d09d47 126 OPT_BOOL('k', NULL, &ignore_errors, N_("skip move/rename errors")),
c7a20c11
PH
127 OPT_END(),
128 };
a88c915d 129 const char **source, **destination, **dest_path, **submodule_gitfile;
ac64a722 130 enum update_mode { BOTH = 0, WORKING_DIRECTORY, INDEX } *modes;
11be42a4 131 struct stat st;
183113a5 132 struct string_list src_for_dst = STRING_LIST_INIT_NODUP;
11be42a4 133
0656781f 134 gitmodules_config();
ef90d6d4 135 git_config(git_default_config, NULL);
11be42a4 136
37782920
SB
137 argc = parse_options(argc, argv, prefix, builtin_mv_options,
138 builtin_mv_usage, 0);
c7a20c11
PH
139 if (--argc < 1)
140 usage_with_options(builtin_mv_usage, builtin_mv_options);
11be42a4 141
b3e83cc7 142 hold_locked_index(&lock_file, LOCK_DIE_ON_ERROR);
99caeed0 143 if (read_cache() < 0)
431b049e 144 die(_("index file corrupt"));
99caeed0 145
2ec87741 146 source = internal_prefix_pathspec(prefix, argv, argc, 0);
c7a20c11 147 modes = xcalloc(argc, sizeof(enum update_mode));
c57f6281
MM
148 /*
149 * Keep trailing slash, needed to let
189d035e
JS
150 * "git mv file no-such-dir/" error out, except in the case
151 * "git mv directory no-such-dir/".
c57f6281 152 */
189d035e
JS
153 flags = KEEP_TRAILING_SLASH;
154 if (argc == 1 && is_directory(argv[0]) && !is_directory(argv[1]))
155 flags = 0;
2ec87741 156 dest_path = internal_prefix_pathspec(prefix, argv + argc, 1, flags);
a88c915d 157 submodule_gitfile = xcalloc(argc, sizeof(char *));
11be42a4 158
c5203bdf
JS
159 if (dest_path[0][0] == '\0')
160 /* special case: "." was normalized to "" */
2ec87741 161 destination = internal_prefix_pathspec(dest_path[0], argv, argc, DUP_BASENAME);
c5203bdf 162 else if (!lstat(dest_path[0], &st) &&
ac64a722
JS
163 S_ISDIR(st.st_mode)) {
164 dest_path[0] = add_slash(dest_path[0]);
2ec87741 165 destination = internal_prefix_pathspec(dest_path[0], argv, argc, DUP_BASENAME);
ac64a722 166 } else {
c7a20c11 167 if (argc != 1)
eac0ccc2 168 die(_("destination '%s' is not a directory"), dest_path[0]);
11be42a4
JS
169 destination = dest_path;
170 }
171
172 /* Checking */
c7a20c11 173 for (i = 0; i < argc; i++) {
60a6bf5f
JS
174 const char *src = source[i], *dst = destination[i];
175 int length, src_is_dir;
11be42a4
JS
176 const char *bad = NULL;
177
178 if (show_only)
431b049e 179 printf(_("Checking rename of '%s' to '%s'\n"), src, dst);
11be42a4 180
60a6bf5f
JS
181 length = strlen(src);
182 if (lstat(src, &st) < 0)
a7d5629f 183 bad = _("bad source");
60a6bf5f
JS
184 else if (!strncmp(src, dst, length) &&
185 (dst[length] == 0 || dst[length] == '/')) {
a7d5629f 186 bad = _("can not move directory into itself");
60a6bf5f
JS
187 } else if ((src_is_dir = S_ISDIR(st.st_mode))
188 && lstat(dst, &st) == 0)
a7d5629f 189 bad = _("cannot move directory over file");
60a6bf5f 190 else if (src_is_dir) {
b46b15de 191 int first = cache_name_pos(src, length), last;
3af05a6d
NTND
192
193 if (first >= 0)
194 prepare_move_submodule(src, first,
195 submodule_gitfile + i);
b46b15de
NTND
196 else if (index_range_of_same_dir(src, length,
197 &first, &last) < 1)
198 bad = _("source directory is empty");
199 else { /* last - first >= 1 */
200 int j, dst_len, n;
11502468
JL
201
202 modes[i] = WORKING_DIRECTORY;
b46b15de 203 n = argc + last - first;
2756ca43
RS
204 REALLOC_ARRAY(source, n);
205 REALLOC_ARRAY(destination, n);
206 REALLOC_ARRAY(modes, n);
207 REALLOC_ARRAY(submodule_gitfile, n);
b46b15de
NTND
208
209 dst = add_slash(dst);
210 dst_len = strlen(dst);
211
212 for (j = 0; j < last - first; j++) {
213 const char *path = active_cache[first + j]->name;
214 source[argc + j] = path;
215 destination[argc + j] =
216 prefix_path(dst, dst_len, path + length + 1);
217 modes[argc + j] = INDEX;
218 submodule_gitfile[argc + j] = NULL;
ac64a722 219 }
b46b15de 220 argc += last - first;
ac64a722 221 }
5aed3c6a 222 } else if (cache_name_pos(src, length) < 0)
a7d5629f 223 bad = _("not under version control");
baa37bff
DT
224 else if (lstat(dst, &st) == 0 &&
225 (!ignore_case || strcasecmp(src, dst))) {
a7d5629f 226 bad = _("destination exists");
11be42a4
JS
227 if (force) {
228 /*
229 * only files can overwrite each other:
230 * check both source and destination
231 */
81dc2307 232 if (S_ISREG(st.st_mode) || S_ISLNK(st.st_mode)) {
534376ca
JK
233 if (verbose)
234 warning(_("overwriting '%s'"), dst);
11be42a4 235 bad = NULL;
11be42a4 236 } else
a7d5629f 237 bad = _("Cannot overwrite");
11be42a4 238 }
5aed3c6a 239 } else if (string_list_has_string(&src_for_dst, dst))
a7d5629f 240 bad = _("multiple sources for the same target");
a8933469
JS
241 else if (is_dir_sep(dst[strlen(dst) - 1]))
242 bad = _("destination directory does not exist");
60a6bf5f 243 else
78a395d3 244 string_list_insert(&src_for_dst, dst);
11be42a4 245
ad1a19d0
NTND
246 if (!bad)
247 continue;
248 if (!ignore_errors)
4f1bbd23 249 die(_("%s, source=%s, destination=%s"),
ad1a19d0
NTND
250 bad, src, dst);
251 if (--argc > 0) {
252 int n = argc - i;
253 memmove(source + i, source + i + 1,
254 n * sizeof(char *));
255 memmove(destination + i, destination + i + 1,
256 n * sizeof(char *));
257 memmove(modes + i, modes + i + 1,
258 n * sizeof(enum update_mode));
259 memmove(submodule_gitfile + i, submodule_gitfile + i + 1,
260 n * sizeof(char *));
261 i--;
11be42a4
JS
262 }
263 }
264
c7a20c11 265 for (i = 0; i < argc; i++) {
60a6bf5f
JS
266 const char *src = source[i], *dst = destination[i];
267 enum update_mode mode = modes[i];
81dc2307 268 int pos;
11be42a4 269 if (show_only || verbose)
431b049e 270 printf(_("Renaming %s to %s\n"), src, dst);
a127331c
SB
271 if (show_only)
272 continue;
273 if (mode != INDEX && rename(src, dst) < 0) {
274 if (ignore_errors)
275 continue;
276 die_errno(_("renaming '%s' failed"), src);
277 }
278 if (submodule_gitfile[i]) {
279 if (submodule_gitfile[i] != SUBMODULE_WITH_GITDIR)
280 connect_work_tree_and_git_dir(dst, submodule_gitfile[i]);
281 if (!update_path_in_gitmodules(src, dst))
282 gitmodules_modified = 1;
a88c915d 283 }
60a6bf5f
JS
284
285 if (mode == WORKING_DIRECTORY)
ac64a722
JS
286 continue;
287
81dc2307
PB
288 pos = cache_name_pos(src, strlen(src));
289 assert(pos >= 0);
290 if (!show_only)
291 rename_cache_entry_at(pos, dst);
11be42a4
JS
292 }
293
0656781f
JL
294 if (gitmodules_modified)
295 stage_updated_gitmodules();
296
dcadc8b8
NTND
297 if (active_cache_changed &&
298 write_locked_index(&the_index, &lock_file, COMMIT_LOCK))
299 die(_("Unable to write new index file"));
11be42a4
JS
300
301 return 0;
302}