]> git.ipfire.org Git - thirdparty/git.git/blame - builtin/ls-files.c
Merge branch 'rs/clarify-entry-cmp-sslice'
[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"
8695c8bf 16
96f1e58f
DR
17static int abbrev;
18static int show_deleted;
19static int show_cached;
20static int show_others;
21static int show_stage;
22static int show_unmerged;
9d9a2f4a 23static int show_resolve_undo;
96f1e58f
DR
24static int show_modified;
25static int show_killed;
26static int show_valid_bit;
b83c8345 27static int line_terminator = '\n';
84974217 28static int debug_mode;
8695c8bf 29
efad1a56
CB
30static const char *prefix;
31static int max_prefix_len;
96f1e58f 32static int prefix_len;
96f1e58f
DR
33static const char **pathspec;
34static int error_unmatch;
35static char *ps_matched;
64586e75 36static const char *with_tree;
ce8e8804 37static int exc_given;
5be4efbe 38
20d37ef6
PB
39static const char *tag_cached = "";
40static const char *tag_unmerged = "";
41static const char *tag_removed = "";
42static const char *tag_other = "";
6ca45943 43static const char *tag_killed = "";
b0391890 44static const char *tag_modified = "";
44a36913 45static const char *tag_skip_worktree = "";
9d9a2f4a 46static const char *tag_resolve_undo = "";
20d37ef6 47
efad1a56
CB
48static void write_name(const char* name, size_t len)
49{
50 write_name_quoted_relative(name, len, prefix, prefix_len, stdout,
51 line_terminator);
52}
53
453ec4bd 54static void show_dir_entry(const char *tag, struct dir_entry *ent)
5be4efbe 55{
efad1a56 56 int len = max_prefix_len;
5be4efbe
LT
57
58 if (len >= ent->len)
7e44c935 59 die("git ls-files: internal error - directory entry not superset of prefix");
5be4efbe 60
0b50922a 61 if (!match_pathspec(pathspec, ent->name, ent->len, len, ps_matched))
5be4efbe
LT
62 return;
63
22ddf719 64 fputs(tag, stdout);
efad1a56 65 write_name(ent->name, ent->len);
5be4efbe
LT
66}
67
453ec4bd 68static void show_other_files(struct dir_struct *dir)
fcbc3083
JH
69{
70 int i;
5698454e 71
453ec4bd 72 for (i = 0; i < dir->nr; i++) {
453ec4bd 73 struct dir_entry *ent = dir->entries[i];
98fa4738
JK
74 if (!cache_name_is_other(ent->name, ent->len))
75 continue;
fcbc3083
JH
76 show_dir_entry(tag_other, ent);
77 }
78}
79
453ec4bd 80static void show_killed_files(struct dir_struct *dir)
6ca45943
JH
81{
82 int i;
453ec4bd
LT
83 for (i = 0; i < dir->nr; i++) {
84 struct dir_entry *ent = dir->entries[i];
6ca45943
JH
85 char *cp, *sp;
86 int pos, len, killed = 0;
87
88 for (cp = ent->name; cp - ent->name < ent->len; cp = sp + 1) {
89 sp = strchr(cp, '/');
90 if (!sp) {
91 /* If ent->name is prefix of an entry in the
92 * cache, it will be killed.
93 */
94 pos = cache_name_pos(ent->name, ent->len);
95 if (0 <= pos)
96 die("bug in show-killed-files");
97 pos = -pos - 1;
98 while (pos < active_nr &&
99 ce_stage(active_cache[pos]))
100 pos++; /* skip unmerged */
101 if (active_nr <= pos)
102 break;
103 /* pos points at a name immediately after
104 * ent->name in the cache. Does it expect
105 * ent->name to be a directory?
106 */
107 len = ce_namelen(active_cache[pos]);
108 if ((ent->len < len) &&
109 !strncmp(active_cache[pos]->name,
110 ent->name, ent->len) &&
111 active_cache[pos]->name[ent->len] == '/')
112 killed = 1;
113 break;
114 }
115 if (0 <= cache_name_pos(ent->name, sp - ent->name)) {
116 /* If any of the leading directories in
117 * ent->name is registered in the cache,
118 * ent->name will be killed.
119 */
120 killed = 1;
121 break;
122 }
123 }
124 if (killed)
453ec4bd 125 show_dir_entry(tag_killed, dir->entries[i]);
6ca45943 126 }
8695c8bf
LT
127}
128
5be4efbe
LT
129static void show_ce_entry(const char *tag, struct cache_entry *ce)
130{
efad1a56 131 int len = max_prefix_len;
5be4efbe
LT
132
133 if (len >= ce_namelen(ce))
7e44c935 134 die("git ls-files: internal error - cache entry not superset of prefix");
5be4efbe 135
0b50922a 136 if (!match_pathspec(pathspec, ce->name, ce_namelen(ce), len, ps_matched))
5be4efbe
LT
137 return;
138
8bb2e03b 139 if (tag && *tag && show_valid_bit &&
7a51ed66 140 (ce->ce_flags & CE_VALID)) {
2bcab240
JH
141 static char alttag[4];
142 memcpy(alttag, tag, 3);
143 if (isalpha(tag[0]))
144 alttag[0] = tolower(tag[0]);
145 else if (tag[0] == '?')
146 alttag[0] = '!';
147 else {
148 alttag[0] = 'v';
149 alttag[1] = tag[0];
150 alttag[2] = ' ';
151 alttag[3] = 0;
152 }
153 tag = alttag;
154 }
155
22ddf719
JH
156 if (!show_stage) {
157 fputs(tag, stdout);
663af342 158 } else {
22ddf719 159 printf("%s%06o %s %d\t",
5be4efbe 160 tag,
7a51ed66 161 ce->ce_mode,
531e758d 162 find_unique_abbrev(ce->sha1,abbrev),
22ddf719 163 ce_stage(ce));
22ddf719 164 }
efad1a56 165 write_name(ce->name, ce_namelen(ce));
84974217
TR
166 if (debug_mode) {
167 printf(" ctime: %d:%d\n", ce->ce_ctime.sec, ce->ce_ctime.nsec);
168 printf(" mtime: %d:%d\n", ce->ce_mtime.sec, ce->ce_mtime.nsec);
169 printf(" dev: %d\tino: %d\n", ce->ce_dev, ce->ce_ino);
170 printf(" uid: %d\tgid: %d\n", ce->ce_uid, ce->ce_gid);
171 printf(" size: %d\tflags: %x\n", ce->ce_size, ce->ce_flags);
172 }
5be4efbe
LT
173}
174
efad1a56 175static void show_ru_info(void)
9d9a2f4a 176{
8a57c6e9
AR
177 struct string_list_item *item;
178
9d9a2f4a
JH
179 if (!the_index.resolve_undo)
180 return;
8a57c6e9
AR
181
182 for_each_string_list_item(item, the_index.resolve_undo) {
183 const char *path = item->string;
184 struct resolve_undo_info *ui = item->util;
185 int i, len;
186
187 len = strlen(path);
188 if (len < max_prefix_len)
189 continue; /* outside of the prefix */
190 if (!match_pathspec(pathspec, path, len, max_prefix_len, ps_matched))
191 continue; /* uninterested */
192 for (i = 0; i < 3; i++) {
193 if (!ui->mode[i])
194 continue;
195 printf("%s%06o %s %d\t", tag_resolve_undo, ui->mode[i],
196 find_unique_abbrev(ui->sha1[i], abbrev),
197 i + 1);
198 write_name(path, len);
199 }
200 }
9d9a2f4a
JH
201}
202
782cd4c0
JH
203static int ce_excluded(struct path_exclude_check *check, struct cache_entry *ce)
204{
205 int dtype = ce_to_dtype(ce);
9013089c 206 return is_path_excluded(check, ce->name, ce_namelen(ce), &dtype);
782cd4c0
JH
207}
208
efad1a56 209static void show_files(struct dir_struct *dir)
8695c8bf
LT
210{
211 int i;
eb41775e
JH
212 struct path_exclude_check check;
213
214 if ((dir->flags & DIR_SHOW_IGNORED))
215 path_exclude_check_init(&check, dir);
8695c8bf
LT
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 }
aee46198 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) &&
782cd4c0 229 !ce_excluded(&check, 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 }
b0391890 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) &&
782cd4c0 245 !ce_excluded(&check, 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 }
eb41775e
JH
258
259 if ((dir->flags & DIR_SHOW_IGNORED))
260 path_exclude_check_clear(&check);
5be4efbe
LT
261}
262
263/*
264 * Prune the index to only contain stuff starting with "prefix"
265 */
3e04228b 266static void prune_cache(const char *prefix)
5be4efbe 267{
efad1a56 268 int pos = cache_name_pos(prefix, max_prefix_len);
5be4efbe
LT
269 unsigned int first, last;
270
271 if (pos < 0)
272 pos = -pos-1;
95af39fc
KP
273 memmove(active_cache, active_cache + pos,
274 (active_nr - pos) * sizeof(struct cache_entry *));
5be4efbe
LT
275 active_nr -= pos;
276 first = 0;
277 last = active_nr;
278 while (last > first) {
279 int next = (last + first) >> 1;
280 struct cache_entry *ce = active_cache[next];
efad1a56 281 if (!strncmp(ce->name, prefix, max_prefix_len)) {
5be4efbe
LT
282 first = next+1;
283 continue;
8695c8bf 284 }
5be4efbe
LT
285 last = next;
286 }
287 active_nr = last;
288}
289
f3670a57
JS
290static void strip_trailing_slash_from_submodules(void)
291{
292 const char **p;
293
294 for (p = pathspec; *p != NULL; p++) {
295 int len = strlen(*p), pos;
296
297 if (len < 1 || (*p)[len - 1] != '/')
298 continue;
299 pos = cache_name_pos(*p, len - 1);
300 if (pos >= 0 && S_ISGITLINK(active_cache[pos]->ce_mode))
301 *p = xstrndup(*p, len - 1);
302 }
303}
304
64586e75
JH
305/*
306 * Read the tree specified with --with-tree option
307 * (typically, HEAD) into stage #1 and then
308 * squash them down to stage #0. This is used for
309 * --error-unmatch to list and check the path patterns
310 * that were given from the command line. We are not
311 * going to write this index out.
312 */
ee425e46 313void overlay_tree_on_cache(const char *tree_name, const char *prefix)
64586e75
JH
314{
315 struct tree *tree;
316 unsigned char sha1[20];
f0096c06 317 struct pathspec pathspec;
64586e75
JH
318 struct cache_entry *last_stage0 = NULL;
319 int i;
320
321 if (get_sha1(tree_name, sha1))
322 die("tree-ish %s not found.", tree_name);
323 tree = parse_tree_indirect(sha1);
324 if (!tree)
325 die("bad tree-ish %s", tree_name);
326
327 /* Hoist the unmerged entries up to stage #3 to make room */
328 for (i = 0; i < active_nr; i++) {
329 struct cache_entry *ce = active_cache[i];
330 if (!ce_stage(ce))
331 continue;
7a51ed66 332 ce->ce_flags |= CE_STAGEMASK;
64586e75
JH
333 }
334
335 if (prefix) {
336 static const char *(matchbuf[2]);
337 matchbuf[0] = prefix;
07e77e40 338 matchbuf[1] = NULL;
f0096c06 339 init_pathspec(&pathspec, matchbuf);
170260ae 340 pathspec.items[0].nowildcard_len = pathspec.items[0].len;
64586e75 341 } else
f0096c06
NTND
342 init_pathspec(&pathspec, NULL);
343 if (read_tree(tree, 1, &pathspec))
64586e75
JH
344 die("unable to read tree entries %s", tree_name);
345
346 for (i = 0; i < active_nr; i++) {
347 struct cache_entry *ce = active_cache[i];
348 switch (ce_stage(ce)) {
349 case 0:
350 last_stage0 = ce;
351 /* fallthru */
352 default:
353 continue;
354 case 1:
355 /*
356 * If there is stage #0 entry for this, we do not
357 * need to show it. We use CE_UPDATE bit to mark
358 * such an entry.
359 */
360 if (last_stage0 &&
361 !strcmp(last_stage0->name, ce->name))
7a51ed66 362 ce->ce_flags |= CE_UPDATE;
64586e75
JH
363 }
364 }
365}
366
0f64bfa9 367int report_path_error(const char *ps_matched, const char **pathspec, const char *prefix)
ee425e46
JH
368{
369 /*
370 * Make sure all pathspec matched; otherwise it is an error.
371 */
0f64bfa9
CB
372 struct strbuf sb = STRBUF_INIT;
373 const char *name;
ee425e46
JH
374 int num, errors = 0;
375 for (num = 0; pathspec[num]; num++) {
376 int other, found_dup;
377
378 if (ps_matched[num])
379 continue;
380 /*
381 * The caller might have fed identical pathspec
382 * twice. Do not barf on such a mistake.
383 */
384 for (found_dup = other = 0;
385 !found_dup && pathspec[other];
386 other++) {
387 if (other == num || !ps_matched[other])
388 continue;
389 if (!strcmp(pathspec[other], pathspec[num]))
390 /*
391 * Ok, we have a match already.
392 */
393 found_dup = 1;
394 }
395 if (found_dup)
396 continue;
397
0f64bfa9 398 name = quote_path_relative(pathspec[num], -1, &sb, prefix);
ee425e46 399 error("pathspec '%s' did not match any file(s) known to git.",
0f64bfa9 400 name);
ee425e46
JH
401 errors++;
402 }
0f64bfa9 403 strbuf_release(&sb);
ee425e46
JH
404 return errors;
405}
406
ce8e8804 407static const char * const ls_files_usage[] = {
377adc3a 408 N_("git ls-files [options] [<file>...]"),
ce8e8804
MV
409 NULL
410};
411
412static int option_parse_z(const struct option *opt,
413 const char *arg, int unset)
414{
415 line_terminator = unset ? '\n' : '\0';
416
417 return 0;
418}
419
420static int option_parse_exclude(const struct option *opt,
421 const char *arg, int unset)
422{
423 struct exclude_list *list = opt->value;
424
425 exc_given = 1;
426 add_exclude(arg, "", 0, list);
427
428 return 0;
429}
430
431static int option_parse_exclude_from(const struct option *opt,
432 const char *arg, int unset)
433{
434 struct dir_struct *dir = opt->value;
435
436 exc_given = 1;
437 add_excludes_from_file(dir, arg);
438
439 return 0;
440}
441
442static int option_parse_exclude_standard(const struct option *opt,
443 const char *arg, int unset)
444{
445 struct dir_struct *dir = opt->value;
446
447 exc_given = 1;
448 setup_standard_excludes(dir);
449
450 return 0;
451}
cf9a113d 452
efad1a56 453int cmd_ls_files(int argc, const char **argv, const char *cmd_prefix)
8695c8bf 454{
ce8e8804 455 int require_work_tree = 0, show_tag = 0;
efad1a56 456 const char *max_prefix;
453ec4bd 457 struct dir_struct dir;
ce8e8804
MV
458 struct option builtin_ls_files_options[] = {
459 { OPTION_CALLBACK, 'z', NULL, NULL, NULL,
377adc3a 460 N_("paths are separated with NUL character"),
ce8e8804
MV
461 PARSE_OPT_NOARG, option_parse_z },
462 OPT_BOOLEAN('t', NULL, &show_tag,
377adc3a 463 N_("identify the file status with tags")),
ce8e8804 464 OPT_BOOLEAN('v', NULL, &show_valid_bit,
377adc3a 465 N_("use lowercase letters for 'assume unchanged' files")),
ce8e8804 466 OPT_BOOLEAN('c', "cached", &show_cached,
377adc3a 467 N_("show cached files in the output (default)")),
ce8e8804 468 OPT_BOOLEAN('d', "deleted", &show_deleted,
377adc3a 469 N_("show deleted files in the output")),
ce8e8804 470 OPT_BOOLEAN('m', "modified", &show_modified,
377adc3a 471 N_("show modified files in the output")),
ce8e8804 472 OPT_BOOLEAN('o', "others", &show_others,
377adc3a 473 N_("show other files in the output")),
ce8e8804 474 OPT_BIT('i', "ignored", &dir.flags,
377adc3a 475 N_("show ignored files in the output"),
ce8e8804
MV
476 DIR_SHOW_IGNORED),
477 OPT_BOOLEAN('s', "stage", &show_stage,
377adc3a 478 N_("show staged contents' object name in the output")),
ce8e8804 479 OPT_BOOLEAN('k', "killed", &show_killed,
377adc3a 480 N_("show files on the filesystem that need to be removed")),
ce8e8804 481 OPT_BIT(0, "directory", &dir.flags,
377adc3a 482 N_("show 'other' directories' name only"),
ce8e8804 483 DIR_SHOW_OTHER_DIRECTORIES),
e9008b9a 484 OPT_NEGBIT(0, "empty-directory", &dir.flags,
377adc3a 485 N_("don't show empty directories"),
ce8e8804
MV
486 DIR_HIDE_EMPTY_DIRECTORIES),
487 OPT_BOOLEAN('u', "unmerged", &show_unmerged,
377adc3a 488 N_("show unmerged files in the output")),
9d9a2f4a 489 OPT_BOOLEAN(0, "resolve-undo", &show_resolve_undo,
377adc3a
NTND
490 N_("show resolve-undo information")),
491 { OPTION_CALLBACK, 'x', "exclude", &dir.exclude_list[EXC_CMDL], N_("pattern"),
492 N_("skip files matching pattern"),
ce8e8804 493 0, option_parse_exclude },
377adc3a
NTND
494 { OPTION_CALLBACK, 'X', "exclude-from", &dir, N_("file"),
495 N_("exclude patterns are read from <file>"),
ce8e8804 496 0, option_parse_exclude_from },
377adc3a
NTND
497 OPT_STRING(0, "exclude-per-directory", &dir.exclude_per_dir, N_("file"),
498 N_("read additional per-directory exclude patterns in <file>")),
ce8e8804 499 { OPTION_CALLBACK, 0, "exclude-standard", &dir, NULL,
377adc3a 500 N_("add the standard git exclusions"),
ce8e8804 501 PARSE_OPT_NOARG, option_parse_exclude_standard },
efad1a56 502 { OPTION_SET_INT, 0, "full-name", &prefix_len, NULL,
377adc3a 503 N_("make the output relative to the project top directory"),
ce8e8804
MV
504 PARSE_OPT_NOARG | PARSE_OPT_NONEG, NULL },
505 OPT_BOOLEAN(0, "error-unmatch", &error_unmatch,
377adc3a
NTND
506 N_("if any <file> is not in the index, treat this as an error")),
507 OPT_STRING(0, "with-tree", &with_tree, N_("tree-ish"),
508 N_("pretend that paths removed since <tree-ish> are still present")),
ce8e8804 509 OPT__ABBREV(&abbrev),
377adc3a 510 OPT_BOOLEAN(0, "debug", &debug_mode, N_("show debugging data")),
ce8e8804
MV
511 OPT_END()
512 };
8695c8bf 513
cbb3167e
NTND
514 if (argc == 2 && !strcmp(argv[1], "-h"))
515 usage_with_options(ls_files_usage, builtin_ls_files_options);
516
453ec4bd 517 memset(&dir, 0, sizeof(dir));
efad1a56 518 prefix = cmd_prefix;
5be4efbe 519 if (prefix)
efad1a56 520 prefix_len = strlen(prefix);
ef90d6d4 521 git_config(git_default_config, NULL);
5be4efbe 522
c28b3d6e
NTND
523 if (read_cache() < 0)
524 die("index file corrupt");
525
37782920 526 argc = parse_options(argc, argv, prefix, builtin_ls_files_options,
ce8e8804
MV
527 ls_files_usage, 0);
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}