2 * "git rm" builtin command
4 * Copyright (C) Linus Torvalds 2006
9 #include "cache-tree.h"
10 #include "tree-walk.h"
12 static const char builtin_rm_usage
[] =
13 "git-rm [-f] [-n] [-r] [--cached] [--ignore-unmatch] [--quiet] [--] <file>...";
20 static void add_list(const char *name
)
22 if (list
.nr
>= list
.alloc
) {
23 list
.alloc
= alloc_nr(list
.alloc
);
24 list
.name
= xrealloc(list
.name
, list
.alloc
* sizeof(const char *));
26 list
.name
[list
.nr
++] = name
;
29 static int remove_file(const char *name
)
35 if (ret
&& errno
== ENOENT
)
36 /* The user has removed it from the filesystem by hand */
39 if (!ret
&& (slash
= strrchr(name
, '/'))) {
40 char *n
= xstrdup(name
);
44 } while (!rmdir(name
) && (slash
= strrchr(name
, '/')));
49 static int check_local_mod(unsigned char *head
, int index_only
)
51 /* items in list are already sorted in the cache order,
52 * so we could do this a lot more efficiently by using
53 * tree_desc based traversal if we wanted to, but I am
54 * lazy, and who cares if removal of files is a tad
55 * slower than the theoretical maximum speed?
60 no_head
= is_null_sha1(head
);
61 for (i
= 0; i
< list
.nr
; i
++) {
64 struct cache_entry
*ce
;
65 const char *name
= list
.name
[i
];
66 unsigned char sha1
[20];
68 int local_changes
= 0;
69 int staged_changes
= 0;
71 pos
= cache_name_pos(name
, strlen(name
));
73 continue; /* removing unmerged entry */
74 ce
= active_cache
[pos
];
76 if (lstat(ce
->name
, &st
) < 0) {
78 fprintf(stderr
, "warning: '%s': %s",
79 ce
->name
, strerror(errno
));
80 /* It already vanished from the working tree */
83 else if (S_ISDIR(st
.st_mode
)) {
84 /* if a file was removed and it is now a
85 * directory, that is the same as ENOENT as
86 * far as git is concerned; we do not track
91 if (ce_match_stat(ce
, &st
, 0))
94 || get_tree_entry(head
, name
, sha1
, &mode
)
95 || ce
->ce_mode
!= create_ce_mode(mode
)
96 || hashcmp(ce
->sha1
, sha1
))
99 if (local_changes
&& staged_changes
)
100 errs
= error("'%s' has staged content different "
101 "from both the file and the HEAD\n"
102 "(use -f to force removal)", name
);
103 else if (!index_only
) {
104 /* It's not dangerous to git-rm --cached a
105 * file if the index matches the file or the
106 * HEAD, since it means the deleted content is
107 * still available somewhere.
110 errs
= error("'%s' has changes staged in the index\n"
111 "(use --cached to keep the file, "
112 "or -f to force removal)", name
);
114 errs
= error("'%s' has local modifications\n"
115 "(use --cached to keep the file, "
116 "or -f to force removal)", name
);
122 static struct lock_file lock_file
;
124 int cmd_rm(int argc
, const char **argv
, const char *prefix
)
127 int show_only
= 0, force
= 0, index_only
= 0, recursive
= 0, quiet
= 0;
128 int ignore_unmatch
= 0;
129 const char **pathspec
;
132 git_config(git_default_config
);
134 newfd
= hold_locked_index(&lock_file
, 1);
136 if (read_cache() < 0)
137 die("index file corrupt");
139 for (i
= 1 ; i
< argc
; i
++) {
140 const char *arg
= argv
[i
];
144 else if (!strcmp(arg
, "--")) {
148 else if (!strcmp(arg
, "-n"))
150 else if (!strcmp(arg
, "--cached"))
152 else if (!strcmp(arg
, "-f"))
154 else if (!strcmp(arg
, "-r"))
156 else if (!strcmp(arg
, "--quiet"))
158 else if (!strcmp(arg
, "--ignore-unmatch"))
161 usage(builtin_rm_usage
);
164 usage(builtin_rm_usage
);
166 pathspec
= get_pathspec(prefix
, argv
+ i
);
168 for (i
= 0; pathspec
[i
] ; i
++)
170 seen
= xcalloc(i
, 1);
172 for (i
= 0; i
< active_nr
; i
++) {
173 struct cache_entry
*ce
= active_cache
[i
];
174 if (!match_pathspec(pathspec
, ce
->name
, ce_namelen(ce
), 0, seen
))
182 for (i
= 0; (match
= pathspec
[i
]) != NULL
; i
++) {
184 if (!ignore_unmatch
) {
185 die("pathspec '%s' did not match any files",
192 if (!recursive
&& seen
[i
] == MATCHED_RECURSIVELY
)
193 die("not removing '%s' recursively without -r",
194 *match
? match
: ".");
202 * If not forced, the file, the index and the HEAD (if exists)
203 * must match; but the file can already been removed, since
204 * this sequence is a natural "novice" way:
208 * Further, if HEAD commit exists, "diff-index --cached" must
209 * report no changes unless forced.
212 unsigned char sha1
[20];
213 if (get_sha1("HEAD", sha1
))
215 if (check_local_mod(sha1
, index_only
))
220 * First remove the names from the index: we won't commit
221 * the index unless all of them succeed.
223 for (i
= 0; i
< list
.nr
; i
++) {
224 const char *path
= list
.name
[i
];
226 printf("rm '%s'\n", path
);
228 if (remove_file_from_cache(path
))
229 die("git-rm: unable to remove %s", path
);
230 cache_tree_invalidate_path(active_cache_tree
, path
);
237 * Then, unless we used "--cached", remove the filenames from
238 * the workspace. If we fail to remove the first one, we
239 * abort the "git rm" (but once we've successfully removed
240 * any file at all, we'll go ahead and commit to it all:
241 * by then we've already committed ourselves and can't fail
246 for (i
= 0; i
< list
.nr
; i
++) {
247 const char *path
= list
.name
[i
];
248 if (!remove_file(path
)) {
253 die("git-rm: %s: %s", path
, strerror(errno
));
257 if (active_cache_changed
) {
258 if (write_cache(newfd
, active_cache
, active_nr
) ||
259 close(newfd
) || commit_locked_index(&lock_file
))
260 die("Unable to write new index file");