[thirdparty/git.git] / builtin / mv.c

/*
 * "git mv" builtin command
 *
 * Copyright (C) 2006 Johannes Schindelin
 */
#define USE_THE_INDEX_COMPATIBILITY_MACROS
#include "builtin.h"
#include "config.h"
#include "pathspec.h"
#include "lockfile.h"
#include "dir.h"
#include "cache-tree.h"
#include "string-list.h"
#include "parse-options.h"
#include "submodule.h"

static const char * const builtin_mv_usage[] = {
	N_("git mv [<options>] <source>... <destination>"),
	NULL
};

#define DUP_BASENAME 1
#define KEEP_TRAILING_SLASH 2

static const char **internal_prefix_pathspec(const char *prefix,
					     const char **pathspec,
					     int count, unsigned flags)
{
	int i;
	const char **result;
	int prefixlen = prefix ? strlen(prefix) : 0;
	ALLOC_ARRAY(result, count + 1);

	/* Create an intermediate copy of the pathspec based on the flags */
	for (i = 0; i < count; i++) {
		int length = strlen(pathspec[i]);
		int to_copy = length;
		char *it;
		while (!(flags & KEEP_TRAILING_SLASH) &&
		       to_copy > 0 && is_dir_sep(pathspec[i][to_copy - 1]))
			to_copy--;

		it = xmemdupz(pathspec[i], to_copy);
		if (flags & DUP_BASENAME) {
			result[i] = xstrdup(basename(it));
			free(it);
		} else {
			result[i] = it;
		}
	}
	result[count] = NULL;

	/* Prefix the pathspec and free the old intermediate strings */
	for (i = 0; i < count; i++) {
		const char *match = prefix_path(prefix, prefixlen, result[i]);
		free((char *) result[i]);
		result[i] = match;
	}

	return result;
}

static const char *add_slash(const char *path)
{
	size_t len = strlen(path);
	if (path[len - 1] != '/') {
		char *with_slash = xmalloc(st_add(len, 2));
		memcpy(with_slash, path, len);
		with_slash[len++] = '/';
		with_slash[len] = 0;
		return with_slash;
	}
	return path;
}

#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(&the_index))
		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);
}

static int index_range_of_same_dir(const char *src, int length,
				   int *first_p, int *last_p)
{
	const char *src_w_slash = add_slash(src);
	int first, last, len_w_slash = length + 1;

	first = cache_name_pos(src_w_slash, len_w_slash);
	if (first >= 0)
		die(_("%.*s is in index"), len_w_slash, src_w_slash);

	first = -1 - first;
	for (last = first; last < active_nr; last++) {
		const char *path = active_cache[last]->name;
		if (strncmp(path, src_w_slash, len_w_slash))
			break;
	}
	if (src_w_slash != src)
		free((char *)src_w_slash);
	*first_p = first;
	*last_p = last;
	return last - first;
}

int cmd_mv(int argc, const char **argv, const char *prefix)
{
	int i, flags, gitmodules_modified = 0;
	int verbose = 0, show_only = 0, force = 0, ignore_errors = 0;
	struct option builtin_mv_options[] = {
		OPT__VERBOSE(&verbose, N_("be verbose")),
		OPT__DRY_RUN(&show_only, N_("dry run")),
		OPT__FORCE(&force, N_("force move/rename even if target exists"),
			   PARSE_OPT_NOCOMPLETE),
		OPT_BOOL('k', NULL, &ignore_errors, N_("skip move/rename errors")),
		OPT_END(),
	};
	const char **source, **destination, **dest_path, **submodule_gitfile;
	enum update_mode { BOTH = 0, WORKING_DIRECTORY, INDEX } *modes;
	struct stat st;
	struct string_list src_for_dst = STRING_LIST_INIT_NODUP;
	struct lock_file lock_file = LOCK_INIT;

	git_config(git_default_config, NULL);

	argc = parse_options(argc, argv, prefix, builtin_mv_options,
			     builtin_mv_usage, 0);
	if (--argc < 1)
		usage_with_options(builtin_mv_usage, builtin_mv_options);

	hold_locked_index(&lock_file, LOCK_DIE_ON_ERROR);
	if (read_cache() < 0)
		die(_("index file corrupt"));

	source = internal_prefix_pathspec(prefix, argv, argc, 0);
	modes = xcalloc(argc, sizeof(enum update_mode));
	/*
	 * Keep trailing slash, needed to let
	 * "git mv file no-such-dir/" error out, except in the case
	 * "git mv directory no-such-dir/".
	 */
	flags = KEEP_TRAILING_SLASH;
	if (argc == 1 && is_directory(argv[0]) && !is_directory(argv[1]))
		flags = 0;
	dest_path = internal_prefix_pathspec(prefix, argv + argc, 1, flags);
	submodule_gitfile = xcalloc(argc, sizeof(char *));

	if (dest_path[0][0] == '\0')
		/* special case: "." was normalized to "" */
		destination = internal_prefix_pathspec(dest_path[0], argv, argc, DUP_BASENAME);
	else if (!lstat(dest_path[0], &st) &&
			S_ISDIR(st.st_mode)) {
		dest_path[0] = add_slash(dest_path[0]);
		destination = internal_prefix_pathspec(dest_path[0], argv, argc, DUP_BASENAME);
	} else {
		if (argc != 1)
			die(_("destination '%s' is not a directory"), dest_path[0]);
		destination = dest_path;
	}

	/* Checking */
	for (i = 0; i < argc; i++) {
		const char *src = source[i], *dst = destination[i];
		int length, src_is_dir;
		const char *bad = NULL;

		if (show_only)
			printf(_("Checking rename of '%s' to '%s'\n"), src, dst);

		length = strlen(src);
		if (lstat(src, &st) < 0)
			bad = _("bad source");
		else if (!strncmp(src, dst, length) &&
				(dst[length] == 0 || dst[length] == '/')) {
			bad = _("can not move directory into itself");
		} else if ((src_is_dir = S_ISDIR(st.st_mode))
				&& lstat(dst, &st) == 0)
			bad = _("cannot move directory over file");
		else if (src_is_dir) {
			int first = cache_name_pos(src, length), last;

			if (first >= 0)
				prepare_move_submodule(src, first,
						       submodule_gitfile + i);
			else if (index_range_of_same_dir(src, length,
							 &first, &last) < 1)
				bad = _("source directory is empty");
			else { /* last - first >= 1 */
				int j, dst_len, n;

				modes[i] = WORKING_DIRECTORY;
				n = argc + last - first;
				REALLOC_ARRAY(source, n);
				REALLOC_ARRAY(destination, n);
				REALLOC_ARRAY(modes, n);
				REALLOC_ARRAY(submodule_gitfile, n);

				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;
					submodule_gitfile[argc + j] = NULL;
				}
				argc += last - first;
			}
		} else if (cache_name_pos(src, length) < 0)
			bad = _("not under version control");
		else if (lstat(dst, &st) == 0 &&
			 (!ignore_case || strcasecmp(src, dst))) {
			bad = _("destination exists");
			if (force) {
				/*
				 * only files can overwrite each other:
				 * check both source and destination
				 */
				if (S_ISREG(st.st_mode) || S_ISLNK(st.st_mode)) {
					if (verbose)
						warning(_("overwriting '%s'"), dst);
					bad = NULL;
				} else
					bad = _("Cannot overwrite");
			}
		} else if (string_list_has_string(&src_for_dst, dst))
			bad = _("multiple sources for the same target");
		else if (is_dir_sep(dst[strlen(dst) - 1]))
			bad = _("destination directory does not exist");
		else
			string_list_insert(&src_for_dst, dst);

		if (!bad)
			continue;
		if (!ignore_errors)
			die(_("%s, source=%s, destination=%s"),
			     bad, src, dst);
		if (--argc > 0) {
			int n = argc - i;
			memmove(source + i, source + i + 1,
				n * sizeof(char *));
			memmove(destination + i, destination + i + 1,
				n * sizeof(char *));
			memmove(modes + i, modes + i + 1,
				n * sizeof(enum update_mode));
			memmove(submodule_gitfile + i, submodule_gitfile + i + 1,
				n * sizeof(char *));
			i--;
		}
	}

	for (i = 0; i < argc; i++) {
		const char *src = source[i], *dst = destination[i];
		enum update_mode mode = modes[i];
		int pos;
		if (show_only || verbose)
			printf(_("Renaming %s to %s\n"), src, dst);
		if (show_only)
			continue;
		if (mode != INDEX && rename(src, dst) < 0) {
			if (ignore_errors)
				continue;
			die_errno(_("renaming '%s' failed"), src);
		}
		if (submodule_gitfile[i]) {
			if (!update_path_in_gitmodules(src, dst))
				gitmodules_modified = 1;
			if (submodule_gitfile[i] != SUBMODULE_WITH_GITDIR)
				connect_work_tree_and_git_dir(dst,
							      submodule_gitfile[i],
							      1);
		}

		if (mode == WORKING_DIRECTORY)
			continue;

		pos = cache_name_pos(src, strlen(src));
		assert(pos >= 0);
		rename_cache_entry_at(pos, dst);
	}

	if (gitmodules_modified)
		stage_updated_gitmodules(&the_index);

	if (write_locked_index(&the_index, &lock_file,
			       COMMIT_LOCK | SKIP_IF_UNCHANGED))
		die(_("Unable to write new index file"));

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