2 * "git rm" builtin command
4 * Copyright (C) Linus Torvalds 2006
9 #include "cache-tree.h"
10 #include "tree-walk.h"
11 #include "parse-options.h"
13 static const char * const builtin_rm_usage[] = {
14 "git rm [options] [--] <file>...",
23 static void add_list(const char *name)
25 if (list.nr >= list.alloc) {
26 list.alloc = alloc_nr(list.alloc);
27 list.name = xrealloc(list.name, list.alloc * sizeof(const char *));
29 list.name[list.nr++] = name;
32 static int check_local_mod(unsigned char *head, int index_only)
34 /* items in list are already sorted in the cache order,
35 * so we could do this a lot more efficiently by using
36 * tree_desc based traversal if we wanted to, but I am
37 * lazy, and who cares if removal of files is a tad
38 * slower than the theoretical maximum speed?
43 no_head = is_null_sha1(head);
44 for (i = 0; i < list.nr; i++) {
47 struct cache_entry *ce;
48 const char *name = list.name[i];
49 unsigned char sha1[20];
51 int local_changes = 0;
52 int staged_changes = 0;
54 pos = cache_name_pos(name, strlen(name));
56 continue; /* removing unmerged entry */
57 ce = active_cache[pos];
59 if (lstat(ce->name, &st) < 0) {
61 fprintf(stderr, "warning: '%s': %s",
62 ce->name, strerror(errno));
63 /* It already vanished from the working tree */
66 else if (S_ISDIR(st.st_mode)) {
67 /* if a file was removed and it is now a
68 * directory, that is the same as ENOENT as
69 * far as git is concerned; we do not track
74 if (ce_match_stat(ce, &st, 0))
77 || get_tree_entry(head, name, sha1, &mode)
78 || ce->ce_mode != create_ce_mode(mode)
79 || hashcmp(ce->sha1, sha1))
82 if (local_changes && staged_changes)
83 errs = error("'%s' has staged content different "
84 "from both the file and the HEAD\n"
85 "(use -f to force removal)", name);
86 else if (!index_only) {
87 /* It's not dangerous to "git rm --cached" a
88 * file if the index matches the file or the
89 * HEAD, since it means the deleted content is
90 * still available somewhere.
93 errs = error("'%s' has changes staged in the index\n"
94 "(use --cached to keep the file, "
95 "or -f to force removal)", name);
97 errs = error("'%s' has local modifications\n"
98 "(use --cached to keep the file, "
99 "or -f to force removal)", name);
105 static struct lock_file lock_file;
107 static int show_only = 0, force = 0, index_only = 0, recursive = 0, quiet = 0;
108 static int ignore_unmatch = 0;
110 static struct option builtin_rm_options[] = {
111 OPT__DRY_RUN(&show_only),
113 OPT_BOOLEAN( 0 , "cached", &index_only, "only remove from the index"),
114 OPT_BOOLEAN('f', "force", &force, "override the up-to-date check"),
115 OPT_BOOLEAN('r', NULL, &recursive, "allow recursive removal"),
116 OPT_BOOLEAN( 0 , "ignore-unmatch", &ignore_unmatch,
117 "exit with a zero status even if nothing matched"),
121 int cmd_rm(int argc, const char **argv, const char *prefix)
124 const char **pathspec;
127 git_config(git_default_config, NULL);
129 argc = parse_options(argc, argv, builtin_rm_options, builtin_rm_usage, 0);
131 usage_with_options(builtin_rm_usage, builtin_rm_options);
136 newfd = hold_locked_index(&lock_file, 1);
138 if (read_cache() < 0)
139 die("index file corrupt");
141 pathspec = get_pathspec(prefix, argv);
143 for (i = 0; pathspec[i] ; i++)
145 seen = xcalloc(i, 1);
147 for (i = 0; i < active_nr; i++) {
148 struct cache_entry *ce = active_cache[i];
149 if (!match_pathspec(pathspec, ce->name, ce_namelen(ce), 0, seen))
157 for (i = 0; (match = pathspec[i]) != NULL ; i++) {
159 if (!ignore_unmatch) {
160 die("pathspec '%s' did not match any files",
167 if (!recursive && seen[i] == MATCHED_RECURSIVELY)
168 die("not removing '%s' recursively without -r",
169 *match ? match : ".");
177 * If not forced, the file, the index and the HEAD (if exists)
178 * must match; but the file can already been removed, since
179 * this sequence is a natural "novice" way:
183 * Further, if HEAD commit exists, "diff-index --cached" must
184 * report no changes unless forced.
187 unsigned char sha1[20];
188 if (get_sha1("HEAD", sha1))
190 if (check_local_mod(sha1, index_only))
195 * First remove the names from the index: we won't commit
196 * the index unless all of them succeed.
198 for (i = 0; i < list.nr; i++) {
199 const char *path = list.name[i];
201 printf("rm '%s'\n", path);
203 if (remove_file_from_cache(path))
204 die("git rm: unable to remove %s", path);
211 * Then, unless we used "--cached", remove the filenames from
212 * the workspace. If we fail to remove the first one, we
213 * abort the "git rm" (but once we've successfully removed
214 * any file at all, we'll go ahead and commit to it all:
215 * by then we've already committed ourselves and can't fail
220 for (i = 0; i < list.nr; i++) {
221 const char *path = list.name[i];
222 if (!remove_path(path)) {
227 die("git rm: %s: %s", path, strerror(errno));
231 if (active_cache_changed) {
232 if (write_cache(newfd, active_cache, active_nr) ||
233 commit_locked_index(&lock_file))
234 die("Unable to write new index file");