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