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"
12 #include "submodule.h"
14 static const char * const builtin_rm_usage
[] = {
15 "git rm [options] [--] <file>...",
27 static int get_ours_cache_pos(const char *path
, int pos
)
31 while ((i
< active_nr
) && !strcmp(active_cache
[i
]->name
, path
)) {
32 if (ce_stage(active_cache
[i
]) == 2)
39 static int check_submodules_use_gitfiles(void)
44 for (i
= 0; i
< list
.nr
; i
++) {
45 const char *name
= list
.entry
[i
].name
;
47 struct cache_entry
*ce
;
50 pos
= cache_name_pos(name
, strlen(name
));
52 pos
= get_ours_cache_pos(name
, pos
);
56 ce
= active_cache
[pos
];
58 if (!S_ISGITLINK(ce
->ce_mode
) ||
59 (lstat(ce
->name
, &st
) < 0) ||
63 if (!submodule_uses_gitfile(name
))
64 errs
= error(_("submodule '%s' (or one of its nested "
65 "submodules) uses a .git directory\n"
66 "(use 'rm -rf' if you really want to remove "
67 "it including all of its history)"), name
);
73 static int check_local_mod(unsigned char *head
, int index_only
)
76 * Items in list are already sorted in the cache order,
77 * so we could do this a lot more efficiently by using
78 * tree_desc based traversal if we wanted to, but I am
79 * lazy, and who cares if removal of files is a tad
80 * slower than the theoretical maximum speed?
85 no_head
= is_null_sha1(head
);
86 for (i
= 0; i
< list
.nr
; i
++) {
89 struct cache_entry
*ce
;
90 const char *name
= list
.entry
[i
].name
;
91 unsigned char sha1
[20];
93 int local_changes
= 0;
94 int staged_changes
= 0;
96 pos
= cache_name_pos(name
, strlen(name
));
99 * Skip unmerged entries except for populated submodules
100 * that could lose history when removed.
102 pos
= get_ours_cache_pos(name
, pos
);
106 if (!S_ISGITLINK(active_cache
[pos
]->ce_mode
) ||
110 ce
= active_cache
[pos
];
112 if (lstat(ce
->name
, &st
) < 0) {
114 warning("'%s': %s", ce
->name
, strerror(errno
));
115 /* It already vanished from the working tree */
118 else if (S_ISDIR(st
.st_mode
)) {
119 /* if a file was removed and it is now a
120 * directory, that is the same as ENOENT as
121 * far as git is concerned; we do not track
122 * directories unless they are submodules.
124 if (!S_ISGITLINK(ce
->ce_mode
))
129 * "rm" of a path that has changes need to be treated
130 * carefully not to allow losing local changes
131 * accidentally. A local change could be (1) file in
132 * work tree is different since the index; and/or (2)
133 * the user staged a content that is different from
134 * the current commit in the index.
136 * In such a case, you would need to --force the
137 * removal. However, "rm --cached" (remove only from
138 * the index) is safe if the index matches the file in
139 * the work tree or the HEAD commit, as it means that
140 * the content being removed is available elsewhere.
144 * Is the index different from the file in the work tree?
145 * If it's a submodule, is its work tree modified?
147 if (ce_match_stat(ce
, &st
, 0) ||
148 (S_ISGITLINK(ce
->ce_mode
) &&
149 !ok_to_remove_submodule(ce
->name
)))
153 * Is the index different from the HEAD commit? By
154 * definition, before the very initial commit,
155 * anything staged in the index is treated by the same
156 * way as changed from the HEAD.
159 || get_tree_entry(head
, name
, sha1
, &mode
)
160 || ce
->ce_mode
!= create_ce_mode(mode
)
161 || hashcmp(ce
->sha1
, sha1
))
165 * If the index does not match the file in the work
166 * tree and if it does not match the HEAD commit
167 * either, (1) "git rm" without --cached definitely
168 * will lose information; (2) "git rm --cached" will
169 * lose information unless it is about removing an
170 * "intent to add" entry.
172 if (local_changes
&& staged_changes
) {
173 if (!index_only
|| !(ce
->ce_flags
& CE_INTENT_TO_ADD
))
174 errs
= error(_("'%s' has staged content different "
175 "from both the file and the HEAD\n"
176 "(use -f to force removal)"), name
);
178 else if (!index_only
) {
180 errs
= error(_("'%s' has changes staged in the index\n"
181 "(use --cached to keep the file, "
182 "or -f to force removal)"), name
);
184 if (S_ISGITLINK(ce
->ce_mode
) &&
185 !submodule_uses_gitfile(name
)) {
186 errs
= error(_("submodule '%s' (or one of its nested "
187 "submodules) uses a .git directory\n"
188 "(use 'rm -rf' if you really want to remove "
189 "it including all of its history)"), name
);
191 errs
= error(_("'%s' has local modifications\n"
192 "(use --cached to keep the file, "
193 "or -f to force removal)"), name
);
200 static struct lock_file lock_file
;
202 static int show_only
= 0, force
= 0, index_only
= 0, recursive
= 0, quiet
= 0;
203 static int ignore_unmatch
= 0;
205 static struct option builtin_rm_options
[] = {
206 OPT__DRY_RUN(&show_only
, "dry run"),
207 OPT__QUIET(&quiet
, "do not list removed files"),
208 OPT_BOOLEAN( 0 , "cached", &index_only
, "only remove from the index"),
209 OPT__FORCE(&force
, "override the up-to-date check"),
210 OPT_BOOLEAN('r', NULL
, &recursive
, "allow recursive removal"),
211 OPT_BOOLEAN( 0 , "ignore-unmatch", &ignore_unmatch
,
212 "exit with a zero status even if nothing matched"),
216 int cmd_rm(int argc
, const char **argv
, const char *prefix
)
219 const char **pathspec
;
222 git_config(git_default_config
, NULL
);
224 argc
= parse_options(argc
, argv
, prefix
, builtin_rm_options
,
225 builtin_rm_usage
, 0);
227 usage_with_options(builtin_rm_usage
, builtin_rm_options
);
232 newfd
= hold_locked_index(&lock_file
, 1);
234 if (read_cache() < 0)
235 die(_("index file corrupt"));
237 pathspec
= get_pathspec(prefix
, argv
);
238 refresh_index(&the_index
, REFRESH_QUIET
, pathspec
, NULL
, NULL
);
241 for (i
= 0; pathspec
[i
] ; i
++)
243 seen
= xcalloc(i
, 1);
245 for (i
= 0; i
< active_nr
; i
++) {
246 struct cache_entry
*ce
= active_cache
[i
];
247 if (!match_pathspec(pathspec
, ce
->name
, ce_namelen(ce
), 0, seen
))
249 ALLOC_GROW(list
.entry
, list
.nr
+ 1, list
.alloc
);
250 list
.entry
[list
.nr
].name
= ce
->name
;
251 list
.entry
[list
.nr
++].is_submodule
= S_ISGITLINK(ce
->ce_mode
);
257 for (i
= 0; (match
= pathspec
[i
]) != NULL
; i
++) {
259 if (!ignore_unmatch
) {
260 die(_("pathspec '%s' did not match any files"),
267 if (!recursive
&& seen
[i
] == MATCHED_RECURSIVELY
)
268 die(_("not removing '%s' recursively without -r"),
269 *match
? match
: ".");
277 * If not forced, the file, the index and the HEAD (if exists)
278 * must match; but the file can already been removed, since
279 * this sequence is a natural "novice" way:
283 * Further, if HEAD commit exists, "diff-index --cached" must
284 * report no changes unless forced.
287 unsigned char sha1
[20];
288 if (get_sha1("HEAD", sha1
))
290 if (check_local_mod(sha1
, index_only
))
292 } else if (!index_only
) {
293 if (check_submodules_use_gitfiles())
298 * First remove the names from the index: we won't commit
299 * the index unless all of them succeed.
301 for (i
= 0; i
< list
.nr
; i
++) {
302 const char *path
= list
.entry
[i
].name
;
304 printf("rm '%s'\n", path
);
306 if (remove_file_from_cache(path
))
307 die(_("git rm: unable to remove %s"), path
);
314 * Then, unless we used "--cached", remove the filenames from
315 * the workspace. If we fail to remove the first one, we
316 * abort the "git rm" (but once we've successfully removed
317 * any file at all, we'll go ahead and commit to it all:
318 * by then we've already committed ourselves and can't fail
323 for (i
= 0; i
< list
.nr
; i
++) {
324 const char *path
= list
.entry
[i
].name
;
325 if (list
.entry
[i
].is_submodule
) {
326 if (is_empty_dir(path
)) {
332 struct strbuf buf
= STRBUF_INIT
;
333 strbuf_addstr(&buf
, path
);
334 if (!remove_dir_recursively(&buf
, 0)) {
336 strbuf_release(&buf
);
339 strbuf_release(&buf
);
340 /* Fallthrough and let remove_path() fail. */
343 if (!remove_path(path
)) {
348 die_errno("git rm: '%s'", path
);
352 if (active_cache_changed
) {
353 if (write_cache(newfd
, active_cache
, active_nr
) ||
354 commit_locked_index(&lock_file
))
355 die(_("Unable to write new index file"));