]>
Commit | Line | Data |
---|---|---|
8695c8bf LT |
1 | /* |
2 | * This merges the file listing in the directory cache index | |
3 | * with the actual working directory list, and shows different | |
4 | * combinations of the two. | |
5 | * | |
6 | * Copyright (C) Linus Torvalds, 2005 | |
7 | */ | |
8695c8bf | 8 | #include "cache.h" |
22ddf719 | 9 | #include "quote.h" |
453ec4bd | 10 | #include "dir.h" |
0864f264 | 11 | #include "builtin.h" |
64586e75 | 12 | #include "tree.h" |
ce8e8804 | 13 | #include "parse-options.h" |
9d9a2f4a JH |
14 | #include "resolve-undo.h" |
15 | #include "string-list.h" | |
8695c8bf | 16 | |
96f1e58f DR |
17 | static int abbrev; |
18 | static int show_deleted; | |
19 | static int show_cached; | |
20 | static int show_others; | |
21 | static int show_stage; | |
22 | static int show_unmerged; | |
9d9a2f4a | 23 | static int show_resolve_undo; |
96f1e58f DR |
24 | static int show_modified; |
25 | static int show_killed; | |
26 | static int show_valid_bit; | |
b83c8345 | 27 | static int line_terminator = '\n'; |
84974217 | 28 | static int debug_mode; |
8695c8bf | 29 | |
efad1a56 CB |
30 | static const char *prefix; |
31 | static int max_prefix_len; | |
96f1e58f | 32 | static int prefix_len; |
96f1e58f DR |
33 | static const char **pathspec; |
34 | static int error_unmatch; | |
35 | static char *ps_matched; | |
64586e75 | 36 | static const char *with_tree; |
ce8e8804 | 37 | static int exc_given; |
c04318e4 | 38 | static int exclude_args; |
5be4efbe | 39 | |
20d37ef6 PB |
40 | static const char *tag_cached = ""; |
41 | static const char *tag_unmerged = ""; | |
42 | static const char *tag_removed = ""; | |
43 | static const char *tag_other = ""; | |
6ca45943 | 44 | static const char *tag_killed = ""; |
b0391890 | 45 | static const char *tag_modified = ""; |
44a36913 | 46 | static const char *tag_skip_worktree = ""; |
9d9a2f4a | 47 | static const char *tag_resolve_undo = ""; |
20d37ef6 | 48 | |
efad1a56 CB |
49 | static void write_name(const char* name, size_t len) |
50 | { | |
51 | write_name_quoted_relative(name, len, prefix, prefix_len, stdout, | |
52 | line_terminator); | |
53 | } | |
54 | ||
453ec4bd | 55 | static void show_dir_entry(const char *tag, struct dir_entry *ent) |
5be4efbe | 56 | { |
efad1a56 | 57 | int len = max_prefix_len; |
5be4efbe LT |
58 | |
59 | if (len >= ent->len) | |
7e44c935 | 60 | die("git ls-files: internal error - directory entry not superset of prefix"); |
5be4efbe | 61 | |
0b50922a | 62 | if (!match_pathspec(pathspec, ent->name, ent->len, len, ps_matched)) |
5be4efbe LT |
63 | return; |
64 | ||
22ddf719 | 65 | fputs(tag, stdout); |
efad1a56 | 66 | write_name(ent->name, ent->len); |
5be4efbe LT |
67 | } |
68 | ||
453ec4bd | 69 | static void show_other_files(struct dir_struct *dir) |
fcbc3083 JH |
70 | { |
71 | int i; | |
5698454e | 72 | |
453ec4bd | 73 | for (i = 0; i < dir->nr; i++) { |
453ec4bd | 74 | struct dir_entry *ent = dir->entries[i]; |
98fa4738 JK |
75 | if (!cache_name_is_other(ent->name, ent->len)) |
76 | continue; | |
fcbc3083 JH |
77 | show_dir_entry(tag_other, ent); |
78 | } | |
79 | } | |
80 | ||
453ec4bd | 81 | static void show_killed_files(struct dir_struct *dir) |
6ca45943 JH |
82 | { |
83 | int i; | |
453ec4bd LT |
84 | for (i = 0; i < dir->nr; i++) { |
85 | struct dir_entry *ent = dir->entries[i]; | |
6ca45943 JH |
86 | char *cp, *sp; |
87 | int pos, len, killed = 0; | |
88 | ||
89 | for (cp = ent->name; cp - ent->name < ent->len; cp = sp + 1) { | |
90 | sp = strchr(cp, '/'); | |
91 | if (!sp) { | |
92 | /* If ent->name is prefix of an entry in the | |
93 | * cache, it will be killed. | |
94 | */ | |
95 | pos = cache_name_pos(ent->name, ent->len); | |
96 | if (0 <= pos) | |
97 | die("bug in show-killed-files"); | |
98 | pos = -pos - 1; | |
99 | while (pos < active_nr && | |
100 | ce_stage(active_cache[pos])) | |
101 | pos++; /* skip unmerged */ | |
102 | if (active_nr <= pos) | |
103 | break; | |
104 | /* pos points at a name immediately after | |
105 | * ent->name in the cache. Does it expect | |
106 | * ent->name to be a directory? | |
107 | */ | |
108 | len = ce_namelen(active_cache[pos]); | |
109 | if ((ent->len < len) && | |
110 | !strncmp(active_cache[pos]->name, | |
111 | ent->name, ent->len) && | |
112 | active_cache[pos]->name[ent->len] == '/') | |
113 | killed = 1; | |
114 | break; | |
115 | } | |
116 | if (0 <= cache_name_pos(ent->name, sp - ent->name)) { | |
117 | /* If any of the leading directories in | |
118 | * ent->name is registered in the cache, | |
119 | * ent->name will be killed. | |
120 | */ | |
121 | killed = 1; | |
122 | break; | |
123 | } | |
124 | } | |
125 | if (killed) | |
453ec4bd | 126 | show_dir_entry(tag_killed, dir->entries[i]); |
6ca45943 | 127 | } |
8695c8bf LT |
128 | } |
129 | ||
5be4efbe LT |
130 | static void show_ce_entry(const char *tag, struct cache_entry *ce) |
131 | { | |
efad1a56 | 132 | int len = max_prefix_len; |
5be4efbe LT |
133 | |
134 | if (len >= ce_namelen(ce)) | |
7e44c935 | 135 | die("git ls-files: internal error - cache entry not superset of prefix"); |
5be4efbe | 136 | |
0b50922a | 137 | if (!match_pathspec(pathspec, ce->name, ce_namelen(ce), len, ps_matched)) |
5be4efbe LT |
138 | return; |
139 | ||
8bb2e03b | 140 | if (tag && *tag && show_valid_bit && |
7a51ed66 | 141 | (ce->ce_flags & CE_VALID)) { |
2bcab240 JH |
142 | static char alttag[4]; |
143 | memcpy(alttag, tag, 3); | |
144 | if (isalpha(tag[0])) | |
145 | alttag[0] = tolower(tag[0]); | |
146 | else if (tag[0] == '?') | |
147 | alttag[0] = '!'; | |
148 | else { | |
149 | alttag[0] = 'v'; | |
150 | alttag[1] = tag[0]; | |
151 | alttag[2] = ' '; | |
152 | alttag[3] = 0; | |
153 | } | |
154 | tag = alttag; | |
155 | } | |
156 | ||
22ddf719 JH |
157 | if (!show_stage) { |
158 | fputs(tag, stdout); | |
663af342 | 159 | } else { |
22ddf719 | 160 | printf("%s%06o %s %d\t", |
5be4efbe | 161 | tag, |
7a51ed66 | 162 | ce->ce_mode, |
531e758d | 163 | find_unique_abbrev(ce->sha1,abbrev), |
22ddf719 | 164 | ce_stage(ce)); |
22ddf719 | 165 | } |
efad1a56 | 166 | write_name(ce->name, ce_namelen(ce)); |
84974217 TR |
167 | if (debug_mode) { |
168 | printf(" ctime: %d:%d\n", ce->ce_ctime.sec, ce->ce_ctime.nsec); | |
169 | printf(" mtime: %d:%d\n", ce->ce_mtime.sec, ce->ce_mtime.nsec); | |
170 | printf(" dev: %d\tino: %d\n", ce->ce_dev, ce->ce_ino); | |
171 | printf(" uid: %d\tgid: %d\n", ce->ce_uid, ce->ce_gid); | |
172 | printf(" size: %d\tflags: %x\n", ce->ce_size, ce->ce_flags); | |
173 | } | |
5be4efbe LT |
174 | } |
175 | ||
efad1a56 | 176 | static void show_ru_info(void) |
9d9a2f4a | 177 | { |
8a57c6e9 AR |
178 | struct string_list_item *item; |
179 | ||
9d9a2f4a JH |
180 | if (!the_index.resolve_undo) |
181 | return; | |
8a57c6e9 AR |
182 | |
183 | for_each_string_list_item(item, the_index.resolve_undo) { | |
184 | const char *path = item->string; | |
185 | struct resolve_undo_info *ui = item->util; | |
186 | int i, len; | |
187 | ||
188 | len = strlen(path); | |
189 | if (len < max_prefix_len) | |
190 | continue; /* outside of the prefix */ | |
191 | if (!match_pathspec(pathspec, path, len, max_prefix_len, ps_matched)) | |
192 | continue; /* uninterested */ | |
193 | for (i = 0; i < 3; i++) { | |
194 | if (!ui->mode[i]) | |
195 | continue; | |
196 | printf("%s%06o %s %d\t", tag_resolve_undo, ui->mode[i], | |
197 | find_unique_abbrev(ui->sha1[i], abbrev), | |
198 | i + 1); | |
199 | write_name(path, len); | |
200 | } | |
201 | } | |
9d9a2f4a JH |
202 | } |
203 | ||
b07bc8c8 | 204 | static int ce_excluded(struct dir_struct *dir, struct cache_entry *ce) |
782cd4c0 JH |
205 | { |
206 | int dtype = ce_to_dtype(ce); | |
b07bc8c8 | 207 | return is_excluded(dir, ce->name, &dtype); |
782cd4c0 JH |
208 | } |
209 | ||
efad1a56 | 210 | static void show_files(struct dir_struct *dir) |
8695c8bf LT |
211 | { |
212 | int i; | |
213 | ||
214 | /* For cached/deleted files we don't need to even do the readdir */ | |
6ca45943 | 215 | if (show_others || show_killed) { |
1d8842d9 | 216 | fill_directory(dir, pathspec); |
6ca45943 | 217 | if (show_others) |
453ec4bd | 218 | show_other_files(dir); |
6ca45943 | 219 | if (show_killed) |
453ec4bd | 220 | show_killed_files(dir); |
8695c8bf | 221 | } |
aee46198 | 222 | if (show_cached | show_stage) { |
8695c8bf LT |
223 | for (i = 0; i < active_nr; i++) { |
224 | struct cache_entry *ce = active_cache[i]; | |
eb41775e | 225 | if ((dir->flags & DIR_SHOW_IGNORED) && |
b07bc8c8 | 226 | !ce_excluded(dir, ce)) |
500348aa | 227 | continue; |
eec8c633 LT |
228 | if (show_unmerged && !ce_stage(ce)) |
229 | continue; | |
7a51ed66 | 230 | if (ce->ce_flags & CE_UPDATE) |
64586e75 | 231 | continue; |
44a36913 NTND |
232 | show_ce_entry(ce_stage(ce) ? tag_unmerged : |
233 | (ce_skip_worktree(ce) ? tag_skip_worktree : tag_cached), ce); | |
8695c8bf LT |
234 | } |
235 | } | |
b0391890 | 236 | if (show_deleted | show_modified) { |
8695c8bf LT |
237 | for (i = 0; i < active_nr; i++) { |
238 | struct cache_entry *ce = active_cache[i]; | |
239 | struct stat st; | |
b0391890 | 240 | int err; |
eb41775e | 241 | if ((dir->flags & DIR_SHOW_IGNORED) && |
b07bc8c8 | 242 | !ce_excluded(dir, ce)) |
500348aa | 243 | continue; |
4b4e26d2 JH |
244 | if (ce->ce_flags & CE_UPDATE) |
245 | continue; | |
b4d1690d NTND |
246 | if (ce_skip_worktree(ce)) |
247 | continue; | |
b0391890 JH |
248 | err = lstat(ce->name, &st); |
249 | if (show_deleted && err) | |
250 | show_ce_entry(tag_removed, ce); | |
2bcab240 | 251 | if (show_modified && ce_modified(ce, &st, 0)) |
b0391890 | 252 | show_ce_entry(tag_modified, ce); |
5be4efbe LT |
253 | } |
254 | } | |
255 | } | |
256 | ||
257 | /* | |
258 | * Prune the index to only contain stuff starting with "prefix" | |
259 | */ | |
3e04228b | 260 | static void prune_cache(const char *prefix) |
5be4efbe | 261 | { |
efad1a56 | 262 | int pos = cache_name_pos(prefix, max_prefix_len); |
5be4efbe LT |
263 | unsigned int first, last; |
264 | ||
265 | if (pos < 0) | |
266 | pos = -pos-1; | |
95af39fc KP |
267 | memmove(active_cache, active_cache + pos, |
268 | (active_nr - pos) * sizeof(struct cache_entry *)); | |
5be4efbe LT |
269 | active_nr -= pos; |
270 | first = 0; | |
271 | last = active_nr; | |
272 | while (last > first) { | |
273 | int next = (last + first) >> 1; | |
274 | struct cache_entry *ce = active_cache[next]; | |
efad1a56 | 275 | if (!strncmp(ce->name, prefix, max_prefix_len)) { |
5be4efbe LT |
276 | first = next+1; |
277 | continue; | |
8695c8bf | 278 | } |
5be4efbe LT |
279 | last = next; |
280 | } | |
281 | active_nr = last; | |
282 | } | |
283 | ||
f3670a57 JS |
284 | static void strip_trailing_slash_from_submodules(void) |
285 | { | |
286 | const char **p; | |
287 | ||
288 | for (p = pathspec; *p != NULL; p++) { | |
289 | int len = strlen(*p), pos; | |
290 | ||
291 | if (len < 1 || (*p)[len - 1] != '/') | |
292 | continue; | |
293 | pos = cache_name_pos(*p, len - 1); | |
294 | if (pos >= 0 && S_ISGITLINK(active_cache[pos]->ce_mode)) | |
295 | *p = xstrndup(*p, len - 1); | |
296 | } | |
297 | } | |
298 | ||
64586e75 JH |
299 | /* |
300 | * Read the tree specified with --with-tree option | |
301 | * (typically, HEAD) into stage #1 and then | |
302 | * squash them down to stage #0. This is used for | |
303 | * --error-unmatch to list and check the path patterns | |
304 | * that were given from the command line. We are not | |
305 | * going to write this index out. | |
306 | */ | |
ee425e46 | 307 | void overlay_tree_on_cache(const char *tree_name, const char *prefix) |
64586e75 JH |
308 | { |
309 | struct tree *tree; | |
310 | unsigned char sha1[20]; | |
f0096c06 | 311 | struct pathspec pathspec; |
64586e75 JH |
312 | struct cache_entry *last_stage0 = NULL; |
313 | int i; | |
314 | ||
315 | if (get_sha1(tree_name, sha1)) | |
316 | die("tree-ish %s not found.", tree_name); | |
317 | tree = parse_tree_indirect(sha1); | |
318 | if (!tree) | |
319 | die("bad tree-ish %s", tree_name); | |
320 | ||
321 | /* Hoist the unmerged entries up to stage #3 to make room */ | |
322 | for (i = 0; i < active_nr; i++) { | |
323 | struct cache_entry *ce = active_cache[i]; | |
324 | if (!ce_stage(ce)) | |
325 | continue; | |
7a51ed66 | 326 | ce->ce_flags |= CE_STAGEMASK; |
64586e75 JH |
327 | } |
328 | ||
329 | if (prefix) { | |
330 | static const char *(matchbuf[2]); | |
331 | matchbuf[0] = prefix; | |
07e77e40 | 332 | matchbuf[1] = NULL; |
f0096c06 | 333 | init_pathspec(&pathspec, matchbuf); |
170260ae | 334 | pathspec.items[0].nowildcard_len = pathspec.items[0].len; |
64586e75 | 335 | } else |
f0096c06 NTND |
336 | init_pathspec(&pathspec, NULL); |
337 | if (read_tree(tree, 1, &pathspec)) | |
64586e75 JH |
338 | die("unable to read tree entries %s", tree_name); |
339 | ||
340 | for (i = 0; i < active_nr; i++) { | |
341 | struct cache_entry *ce = active_cache[i]; | |
342 | switch (ce_stage(ce)) { | |
343 | case 0: | |
344 | last_stage0 = ce; | |
345 | /* fallthru */ | |
346 | default: | |
347 | continue; | |
348 | case 1: | |
349 | /* | |
350 | * If there is stage #0 entry for this, we do not | |
351 | * need to show it. We use CE_UPDATE bit to mark | |
352 | * such an entry. | |
353 | */ | |
354 | if (last_stage0 && | |
355 | !strcmp(last_stage0->name, ce->name)) | |
7a51ed66 | 356 | ce->ce_flags |= CE_UPDATE; |
64586e75 JH |
357 | } |
358 | } | |
359 | } | |
360 | ||
0f64bfa9 | 361 | int report_path_error(const char *ps_matched, const char **pathspec, const char *prefix) |
ee425e46 JH |
362 | { |
363 | /* | |
364 | * Make sure all pathspec matched; otherwise it is an error. | |
365 | */ | |
0f64bfa9 CB |
366 | struct strbuf sb = STRBUF_INIT; |
367 | const char *name; | |
ee425e46 JH |
368 | int num, errors = 0; |
369 | for (num = 0; pathspec[num]; num++) { | |
370 | int other, found_dup; | |
371 | ||
372 | if (ps_matched[num]) | |
373 | continue; | |
374 | /* | |
375 | * The caller might have fed identical pathspec | |
376 | * twice. Do not barf on such a mistake. | |
377 | */ | |
378 | for (found_dup = other = 0; | |
379 | !found_dup && pathspec[other]; | |
380 | other++) { | |
381 | if (other == num || !ps_matched[other]) | |
382 | continue; | |
383 | if (!strcmp(pathspec[other], pathspec[num])) | |
384 | /* | |
385 | * Ok, we have a match already. | |
386 | */ | |
387 | found_dup = 1; | |
388 | } | |
389 | if (found_dup) | |
390 | continue; | |
391 | ||
0f64bfa9 | 392 | name = quote_path_relative(pathspec[num], -1, &sb, prefix); |
ee425e46 | 393 | error("pathspec '%s' did not match any file(s) known to git.", |
0f64bfa9 | 394 | name); |
ee425e46 JH |
395 | errors++; |
396 | } | |
0f64bfa9 | 397 | strbuf_release(&sb); |
ee425e46 JH |
398 | return errors; |
399 | } | |
400 | ||
ce8e8804 | 401 | static const char * const ls_files_usage[] = { |
377adc3a | 402 | N_("git ls-files [options] [<file>...]"), |
ce8e8804 MV |
403 | NULL |
404 | }; | |
405 | ||
406 | static int option_parse_z(const struct option *opt, | |
407 | const char *arg, int unset) | |
408 | { | |
409 | line_terminator = unset ? '\n' : '\0'; | |
410 | ||
411 | return 0; | |
412 | } | |
413 | ||
414 | static int option_parse_exclude(const struct option *opt, | |
415 | const char *arg, int unset) | |
416 | { | |
72aeb187 | 417 | struct string_list *exclude_list = opt->value; |
ce8e8804 MV |
418 | |
419 | exc_given = 1; | |
72aeb187 | 420 | string_list_append(exclude_list, arg); |
ce8e8804 MV |
421 | |
422 | return 0; | |
423 | } | |
424 | ||
425 | static int option_parse_exclude_from(const struct option *opt, | |
426 | const char *arg, int unset) | |
427 | { | |
428 | struct dir_struct *dir = opt->value; | |
429 | ||
430 | exc_given = 1; | |
431 | add_excludes_from_file(dir, arg); | |
432 | ||
433 | return 0; | |
434 | } | |
435 | ||
436 | static int option_parse_exclude_standard(const struct option *opt, | |
437 | const char *arg, int unset) | |
438 | { | |
439 | struct dir_struct *dir = opt->value; | |
440 | ||
441 | exc_given = 1; | |
442 | setup_standard_excludes(dir); | |
443 | ||
444 | return 0; | |
445 | } | |
cf9a113d | 446 | |
efad1a56 | 447 | int cmd_ls_files(int argc, const char **argv, const char *cmd_prefix) |
8695c8bf | 448 | { |
72aeb187 | 449 | int require_work_tree = 0, show_tag = 0, i; |
efad1a56 | 450 | const char *max_prefix; |
453ec4bd | 451 | struct dir_struct dir; |
72aeb187 AS |
452 | struct exclude_list *el; |
453 | struct string_list exclude_list = STRING_LIST_INIT_NODUP; | |
ce8e8804 MV |
454 | struct option builtin_ls_files_options[] = { |
455 | { OPTION_CALLBACK, 'z', NULL, NULL, NULL, | |
377adc3a | 456 | N_("paths are separated with NUL character"), |
ce8e8804 MV |
457 | PARSE_OPT_NOARG, option_parse_z }, |
458 | OPT_BOOLEAN('t', NULL, &show_tag, | |
377adc3a | 459 | N_("identify the file status with tags")), |
ce8e8804 | 460 | OPT_BOOLEAN('v', NULL, &show_valid_bit, |
377adc3a | 461 | N_("use lowercase letters for 'assume unchanged' files")), |
ce8e8804 | 462 | OPT_BOOLEAN('c', "cached", &show_cached, |
377adc3a | 463 | N_("show cached files in the output (default)")), |
ce8e8804 | 464 | OPT_BOOLEAN('d', "deleted", &show_deleted, |
377adc3a | 465 | N_("show deleted files in the output")), |
ce8e8804 | 466 | OPT_BOOLEAN('m', "modified", &show_modified, |
377adc3a | 467 | N_("show modified files in the output")), |
ce8e8804 | 468 | OPT_BOOLEAN('o', "others", &show_others, |
377adc3a | 469 | N_("show other files in the output")), |
ce8e8804 | 470 | OPT_BIT('i', "ignored", &dir.flags, |
377adc3a | 471 | N_("show ignored files in the output"), |
ce8e8804 MV |
472 | DIR_SHOW_IGNORED), |
473 | OPT_BOOLEAN('s', "stage", &show_stage, | |
377adc3a | 474 | N_("show staged contents' object name in the output")), |
ce8e8804 | 475 | OPT_BOOLEAN('k', "killed", &show_killed, |
377adc3a | 476 | N_("show files on the filesystem that need to be removed")), |
ce8e8804 | 477 | OPT_BIT(0, "directory", &dir.flags, |
377adc3a | 478 | N_("show 'other' directories' name only"), |
ce8e8804 | 479 | DIR_SHOW_OTHER_DIRECTORIES), |
e9008b9a | 480 | OPT_NEGBIT(0, "empty-directory", &dir.flags, |
377adc3a | 481 | N_("don't show empty directories"), |
ce8e8804 MV |
482 | DIR_HIDE_EMPTY_DIRECTORIES), |
483 | OPT_BOOLEAN('u', "unmerged", &show_unmerged, | |
377adc3a | 484 | N_("show unmerged files in the output")), |
9d9a2f4a | 485 | OPT_BOOLEAN(0, "resolve-undo", &show_resolve_undo, |
377adc3a | 486 | N_("show resolve-undo information")), |
a39b15b4 | 487 | { OPTION_CALLBACK, 'x', "exclude", &exclude_list, N_("pattern"), |
377adc3a | 488 | N_("skip files matching pattern"), |
ce8e8804 | 489 | 0, option_parse_exclude }, |
377adc3a NTND |
490 | { OPTION_CALLBACK, 'X', "exclude-from", &dir, N_("file"), |
491 | N_("exclude patterns are read from <file>"), | |
ce8e8804 | 492 | 0, option_parse_exclude_from }, |
377adc3a NTND |
493 | OPT_STRING(0, "exclude-per-directory", &dir.exclude_per_dir, N_("file"), |
494 | N_("read additional per-directory exclude patterns in <file>")), | |
ce8e8804 | 495 | { OPTION_CALLBACK, 0, "exclude-standard", &dir, NULL, |
377adc3a | 496 | N_("add the standard git exclusions"), |
ce8e8804 | 497 | PARSE_OPT_NOARG, option_parse_exclude_standard }, |
efad1a56 | 498 | { OPTION_SET_INT, 0, "full-name", &prefix_len, NULL, |
377adc3a | 499 | N_("make the output relative to the project top directory"), |
ce8e8804 MV |
500 | PARSE_OPT_NOARG | PARSE_OPT_NONEG, NULL }, |
501 | OPT_BOOLEAN(0, "error-unmatch", &error_unmatch, | |
377adc3a NTND |
502 | N_("if any <file> is not in the index, treat this as an error")), |
503 | OPT_STRING(0, "with-tree", &with_tree, N_("tree-ish"), | |
504 | N_("pretend that paths removed since <tree-ish> are still present")), | |
ce8e8804 | 505 | OPT__ABBREV(&abbrev), |
377adc3a | 506 | OPT_BOOLEAN(0, "debug", &debug_mode, N_("show debugging data")), |
ce8e8804 MV |
507 | OPT_END() |
508 | }; | |
8695c8bf | 509 | |
cbb3167e NTND |
510 | if (argc == 2 && !strcmp(argv[1], "-h")) |
511 | usage_with_options(ls_files_usage, builtin_ls_files_options); | |
512 | ||
453ec4bd | 513 | memset(&dir, 0, sizeof(dir)); |
efad1a56 | 514 | prefix = cmd_prefix; |
5be4efbe | 515 | if (prefix) |
efad1a56 | 516 | prefix_len = strlen(prefix); |
ef90d6d4 | 517 | git_config(git_default_config, NULL); |
5be4efbe | 518 | |
c28b3d6e NTND |
519 | if (read_cache() < 0) |
520 | die("index file corrupt"); | |
521 | ||
37782920 | 522 | argc = parse_options(argc, argv, prefix, builtin_ls_files_options, |
ce8e8804 | 523 | ls_files_usage, 0); |
72aeb187 AS |
524 | el = add_exclude_list(&dir, EXC_CMDL, "--exclude option"); |
525 | for (i = 0; i < exclude_list.nr; i++) { | |
526 | add_exclude(exclude_list.items[i].string, "", 0, el, --exclude_args); | |
527 | } | |
ce8e8804 MV |
528 | if (show_tag || show_valid_bit) { |
529 | tag_cached = "H "; | |
530 | tag_unmerged = "M "; | |
531 | tag_removed = "R "; | |
532 | tag_modified = "C "; | |
533 | tag_other = "? "; | |
534 | tag_killed = "K "; | |
44a36913 | 535 | tag_skip_worktree = "S "; |
9d9a2f4a | 536 | tag_resolve_undo = "U "; |
9ff768e9 | 537 | } |
de2e3b04 | 538 | if (show_modified || show_others || show_deleted || (dir.flags & DIR_SHOW_IGNORED) || show_killed) |
ce8e8804 MV |
539 | require_work_tree = 1; |
540 | if (show_unmerged) | |
541 | /* | |
542 | * There's no point in showing unmerged unless | |
543 | * you also show the stage information. | |
544 | */ | |
545 | show_stage = 1; | |
546 | if (dir.exclude_per_dir) | |
547 | exc_given = 1; | |
9ff768e9 | 548 | |
7d8ae932 MH |
549 | if (require_work_tree && !is_inside_work_tree()) |
550 | setup_work_tree(); | |
6d9ba67b | 551 | |
ce8e8804 | 552 | pathspec = get_pathspec(prefix, argv); |
56fc5108 | 553 | |
3ea3c215 | 554 | /* be nice with submodule paths ending in a slash */ |
f3670a57 JS |
555 | if (pathspec) |
556 | strip_trailing_slash_from_submodules(); | |
557 | ||
efad1a56 | 558 | /* Find common prefix for all pathspec's */ |
f950eb95 | 559 | max_prefix = common_prefix(pathspec); |
8894d535 | 560 | max_prefix_len = max_prefix ? strlen(max_prefix) : 0; |
5be4efbe | 561 | |
bba319b5 JH |
562 | /* Treat unmatching pathspec elements as errors */ |
563 | if (pathspec && error_unmatch) { | |
564 | int num; | |
565 | for (num = 0; pathspec[num]; num++) | |
566 | ; | |
567 | ps_matched = xcalloc(1, num); | |
568 | } | |
569 | ||
ac78b009 BW |
570 | if ((dir.flags & DIR_SHOW_IGNORED) && !exc_given) |
571 | die("ls-files --ignored needs some exclude pattern"); | |
8695c8bf LT |
572 | |
573 | /* With no flags, we default to showing the cached files */ | |
b0391890 | 574 | if (!(show_stage | show_deleted | show_others | show_unmerged | |
9d9a2f4a | 575 | show_killed | show_modified | show_resolve_undo)) |
8695c8bf LT |
576 | show_cached = 1; |
577 | ||
efad1a56 CB |
578 | if (max_prefix) |
579 | prune_cache(max_prefix); | |
64586e75 JH |
580 | if (with_tree) { |
581 | /* | |
582 | * Basic sanity check; show-stages and show-unmerged | |
583 | * would not make any sense with this option. | |
584 | */ | |
585 | if (show_stage || show_unmerged) | |
586 | die("ls-files --with-tree is incompatible with -s or -u"); | |
efad1a56 | 587 | overlay_tree_on_cache(with_tree, max_prefix); |
64586e75 | 588 | } |
efad1a56 | 589 | show_files(&dir); |
9d9a2f4a | 590 | if (show_resolve_undo) |
efad1a56 | 591 | show_ru_info(); |
bba319b5 JH |
592 | |
593 | if (ps_matched) { | |
ee425e46 | 594 | int bad; |
0f64bfa9 | 595 | bad = report_path_error(ps_matched, pathspec, prefix); |
ee425e46 | 596 | if (bad) |
ced7b828 AE |
597 | fprintf(stderr, "Did you forget to 'git add'?\n"); |
598 | ||
ee425e46 | 599 | return bad ? 1 : 0; |
bba319b5 JH |
600 | } |
601 | ||
8695c8bf LT |
602 | return 0; |
603 | } |