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