]>
Commit | Line | Data |
---|---|---|
d9b814cc LT |
1 | /* |
2 | * "git rm" builtin command | |
3 | * | |
4 | * Copyright (C) Linus Torvalds 2006 | |
5 | */ | |
6 | #include "cache.h" | |
7 | #include "builtin.h" | |
8 | #include "dir.h" | |
3fb3cc69 | 9 | #include "cache-tree.h" |
9f95069b | 10 | #include "tree-walk.h" |
f09985c2 | 11 | #include "parse-options.h" |
d9b814cc | 12 | |
f09985c2 | 13 | static const char * const builtin_rm_usage[] = { |
1b1dd23f | 14 | "git rm [options] [--] <file>...", |
f09985c2 PH |
15 | NULL |
16 | }; | |
d9b814cc LT |
17 | |
18 | static struct { | |
19 | int nr, alloc; | |
20 | const char **name; | |
21 | } list; | |
22 | ||
23 | static void add_list(const char *name) | |
24 | { | |
25 | if (list.nr >= list.alloc) { | |
26 | list.alloc = alloc_nr(list.alloc); | |
27 | list.name = xrealloc(list.name, list.alloc * sizeof(const char *)); | |
28 | } | |
29 | list.name[list.nr++] = name; | |
30 | } | |
31 | ||
bdecd9d4 | 32 | static int check_local_mod(unsigned char *head, int index_only) |
9f95069b JH |
33 | { |
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? | |
39 | */ | |
40 | int i, no_head; | |
41 | int errs = 0; | |
42 | ||
43 | no_head = is_null_sha1(head); | |
44 | for (i = 0; i < list.nr; i++) { | |
45 | struct stat st; | |
46 | int pos; | |
47 | struct cache_entry *ce; | |
48 | const char *name = list.name[i]; | |
49 | unsigned char sha1[20]; | |
50 | unsigned mode; | |
bdecd9d4 MM |
51 | int local_changes = 0; |
52 | int staged_changes = 0; | |
9f95069b JH |
53 | |
54 | pos = cache_name_pos(name, strlen(name)); | |
55 | if (pos < 0) | |
56 | continue; /* removing unmerged entry */ | |
57 | ce = active_cache[pos]; | |
58 | ||
59 | if (lstat(ce->name, &st) < 0) { | |
60 | if (errno != ENOENT) | |
61 | fprintf(stderr, "warning: '%s': %s", | |
62 | ce->name, strerror(errno)); | |
63 | /* It already vanished from the working tree */ | |
64 | continue; | |
65 | } | |
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 | |
70 | * directories. | |
71 | */ | |
72 | continue; | |
73 | } | |
74 | if (ce_match_stat(ce, &st, 0)) | |
bdecd9d4 | 75 | local_changes = 1; |
e4d9516b JK |
76 | if (no_head |
77 | || get_tree_entry(head, name, sha1, &mode) | |
78 | || ce->ce_mode != create_ce_mode(mode) | |
79 | || hashcmp(ce->sha1, sha1)) | |
bdecd9d4 MM |
80 | staged_changes = 1; |
81 | ||
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) { | |
f18d244a | 87 | /* It's not dangerous to "git rm --cached" a |
bdecd9d4 MM |
88 | * file if the index matches the file or the |
89 | * HEAD, since it means the deleted content is | |
90 | * still available somewhere. | |
91 | */ | |
92 | if (staged_changes) | |
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); | |
96 | if (local_changes) | |
97 | errs = error("'%s' has local modifications\n" | |
98 | "(use --cached to keep the file, " | |
99 | "or -f to force removal)", name); | |
100 | } | |
9f95069b JH |
101 | } |
102 | return errs; | |
103 | } | |
104 | ||
021b6e45 | 105 | static struct lock_file lock_file; |
d9b814cc | 106 | |
f09985c2 PH |
107 | static int show_only = 0, force = 0, index_only = 0, recursive = 0, quiet = 0; |
108 | static int ignore_unmatch = 0; | |
109 | ||
110 | static struct option builtin_rm_options[] = { | |
111 | OPT__DRY_RUN(&show_only), | |
112 | OPT__QUIET(&quiet), | |
113 | OPT_BOOLEAN( 0 , "cached", &index_only, "only remove from the index"), | |
01144f20 | 114 | OPT_BOOLEAN('f', "force", &force, "override the up-to-date check"), |
f09985c2 PH |
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"), | |
118 | OPT_END(), | |
119 | }; | |
120 | ||
a633fca0 | 121 | int cmd_rm(int argc, const char **argv, const char *prefix) |
d9b814cc LT |
122 | { |
123 | int i, newfd; | |
d9b814cc LT |
124 | const char **pathspec; |
125 | char *seen; | |
126 | ||
ef90d6d4 | 127 | git_config(git_default_config, NULL); |
d9b814cc | 128 | |
f09985c2 PH |
129 | argc = parse_options(argc, argv, builtin_rm_options, builtin_rm_usage, 0); |
130 | if (!argc) | |
131 | usage_with_options(builtin_rm_usage, builtin_rm_options); | |
d9b814cc | 132 | |
271bb087 MH |
133 | if (!index_only) |
134 | setup_work_tree(); | |
135 | ||
4d264672 OM |
136 | newfd = hold_locked_index(&lock_file, 1); |
137 | ||
138 | if (read_cache() < 0) | |
139 | die("index file corrupt"); | |
cced48a8 | 140 | refresh_cache(REFRESH_QUIET); |
4d264672 | 141 | |
f09985c2 | 142 | pathspec = get_pathspec(prefix, argv); |
d9b814cc | 143 | seen = NULL; |
7612a1ef JH |
144 | for (i = 0; pathspec[i] ; i++) |
145 | /* nothing */; | |
28f75818 | 146 | seen = xcalloc(i, 1); |
d9b814cc LT |
147 | |
148 | for (i = 0; i < active_nr; i++) { | |
149 | struct cache_entry *ce = active_cache[i]; | |
150 | if (!match_pathspec(pathspec, ce->name, ce_namelen(ce), 0, seen)) | |
151 | continue; | |
152 | add_list(ce->name); | |
153 | } | |
154 | ||
155 | if (pathspec) { | |
156 | const char *match; | |
bb1faf0d | 157 | int seen_any = 0; |
d9b814cc | 158 | for (i = 0; (match = pathspec[i]) != NULL ; i++) { |
bb1faf0d SG |
159 | if (!seen[i]) { |
160 | if (!ignore_unmatch) { | |
161 | die("pathspec '%s' did not match any files", | |
162 | match); | |
163 | } | |
164 | } | |
165 | else { | |
166 | seen_any = 1; | |
167 | } | |
9f95069b JH |
168 | if (!recursive && seen[i] == MATCHED_RECURSIVELY) |
169 | die("not removing '%s' recursively without -r", | |
170 | *match ? match : "."); | |
d9b814cc | 171 | } |
bb1faf0d SG |
172 | |
173 | if (! seen_any) | |
174 | exit(0); | |
d9b814cc LT |
175 | } |
176 | ||
9f95069b JH |
177 | /* |
178 | * If not forced, the file, the index and the HEAD (if exists) | |
179 | * must match; but the file can already been removed, since | |
180 | * this sequence is a natural "novice" way: | |
181 | * | |
9474eda6 | 182 | * rm F; git rm F |
9f95069b JH |
183 | * |
184 | * Further, if HEAD commit exists, "diff-index --cached" must | |
185 | * report no changes unless forced. | |
186 | */ | |
187 | if (!force) { | |
188 | unsigned char sha1[20]; | |
189 | if (get_sha1("HEAD", sha1)) | |
190 | hashclr(sha1); | |
bdecd9d4 | 191 | if (check_local_mod(sha1, index_only)) |
9f95069b JH |
192 | exit(1); |
193 | } | |
194 | ||
d9b814cc LT |
195 | /* |
196 | * First remove the names from the index: we won't commit | |
9f95069b | 197 | * the index unless all of them succeed. |
d9b814cc LT |
198 | */ |
199 | for (i = 0; i < list.nr; i++) { | |
200 | const char *path = list.name[i]; | |
b48caa20 SG |
201 | if (!quiet) |
202 | printf("rm '%s'\n", path); | |
d9b814cc LT |
203 | |
204 | if (remove_file_from_cache(path)) | |
7e44c935 | 205 | die("git rm: unable to remove %s", path); |
d9b814cc LT |
206 | } |
207 | ||
7612a1ef JH |
208 | if (show_only) |
209 | return 0; | |
210 | ||
d9b814cc | 211 | /* |
646ac22b | 212 | * Then, unless we used "--cached", remove the filenames from |
9f95069b | 213 | * the workspace. If we fail to remove the first one, we |
d9b814cc LT |
214 | * abort the "git rm" (but once we've successfully removed |
215 | * any file at all, we'll go ahead and commit to it all: | |
82e5a82f | 216 | * by then we've already committed ourselves and can't fail |
d9b814cc LT |
217 | * in the middle) |
218 | */ | |
9f95069b | 219 | if (!index_only) { |
d9b814cc LT |
220 | int removed = 0; |
221 | for (i = 0; i < list.nr; i++) { | |
222 | const char *path = list.name[i]; | |
175a4948 | 223 | if (!remove_path(path)) { |
d9b814cc LT |
224 | removed = 1; |
225 | continue; | |
226 | } | |
227 | if (!removed) | |
7e44c935 | 228 | die("git rm: %s: %s", path, strerror(errno)); |
d9b814cc LT |
229 | } |
230 | } | |
231 | ||
232 | if (active_cache_changed) { | |
233 | if (write_cache(newfd, active_cache, active_nr) || | |
4ed7cd3a | 234 | commit_locked_index(&lock_file)) |
d9b814cc LT |
235 | die("Unable to write new index file"); |
236 | } | |
237 | ||
238 | return 0; | |
239 | } |