convert common_prefix() to use struct 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
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
9e06d6ed 63 if (!match_pathspec_depth(&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
9e06d6ed 138 if (!match_pathspec_depth(&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 */
9e06d6ed 194 if (!match_pathspec_depth(&pathspec, path, len, max_prefix_len, ps_matched))
8a57c6e9
AR
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) {
7327d3d1 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
64586e75
JH
287/*
288 * Read the tree specified with --with-tree option
289 * (typically, HEAD) into stage #1 and then
290 * squash them down to stage #0. This is used for
291 * --error-unmatch to list and check the path patterns
292 * that were given from the command line. We are not
293 * going to write this index out.
294 */
ee425e46 295void overlay_tree_on_cache(const char *tree_name, const char *prefix)
64586e75
JH
296{
297 struct tree *tree;
298 unsigned char sha1[20];
f0096c06 299 struct pathspec pathspec;
64586e75
JH
300 struct cache_entry *last_stage0 = NULL;
301 int i;
302
303 if (get_sha1(tree_name, sha1))
304 die("tree-ish %s not found.", tree_name);
305 tree = parse_tree_indirect(sha1);
306 if (!tree)
307 die("bad tree-ish %s", tree_name);
308
309 /* Hoist the unmerged entries up to stage #3 to make room */
310 for (i = 0; i < active_nr; i++) {
311 struct cache_entry *ce = active_cache[i];
312 if (!ce_stage(ce))
313 continue;
7a51ed66 314 ce->ce_flags |= CE_STAGEMASK;
64586e75
JH
315 }
316
317 if (prefix) {
318 static const char *(matchbuf[2]);
319 matchbuf[0] = prefix;
07e77e40 320 matchbuf[1] = NULL;
f0096c06 321 init_pathspec(&pathspec, matchbuf);
170260ae 322 pathspec.items[0].nowildcard_len = pathspec.items[0].len;
64586e75 323 } else
f0096c06
NTND
324 init_pathspec(&pathspec, NULL);
325 if (read_tree(tree, 1, &pathspec))
64586e75
JH
326 die("unable to read tree entries %s", tree_name);
327
328 for (i = 0; i < active_nr; i++) {
329 struct cache_entry *ce = active_cache[i];
330 switch (ce_stage(ce)) {
331 case 0:
332 last_stage0 = ce;
333 /* fallthru */
334 default:
335 continue;
336 case 1:
337 /*
338 * If there is stage #0 entry for this, we do not
339 * need to show it. We use CE_UPDATE bit to mark
340 * such an entry.
341 */
342 if (last_stage0 &&
343 !strcmp(last_stage0->name, ce->name))
7a51ed66 344 ce->ce_flags |= CE_UPDATE;
64586e75
JH
345 }
346 }
347}
348
17ddc66e
NTND
349int report_path_error(const char *ps_matched,
350 const struct pathspec *pathspec,
351 const char *prefix)
ee425e46
JH
352{
353 /*
354 * Make sure all pathspec matched; otherwise it is an error.
355 */
0f64bfa9 356 struct strbuf sb = STRBUF_INIT;
ee425e46 357 int num, errors = 0;
17ddc66e 358 for (num = 0; num < pathspec->nr; num++) {
ee425e46
JH
359 int other, found_dup;
360
361 if (ps_matched[num])
362 continue;
363 /*
364 * The caller might have fed identical pathspec
365 * twice. Do not barf on such a mistake.
17ddc66e
NTND
366 * FIXME: parse_pathspec should have eliminated
367 * duplicate pathspec.
ee425e46
JH
368 */
369 for (found_dup = other = 0;
17ddc66e 370 !found_dup && other < pathspec->nr;
ee425e46
JH
371 other++) {
372 if (other == num || !ps_matched[other])
373 continue;
17ddc66e
NTND
374 if (!strcmp(pathspec->items[other].original,
375 pathspec->items[num].original))
ee425e46
JH
376 /*
377 * Ok, we have a match already.
378 */
379 found_dup = 1;
380 }
381 if (found_dup)
382 continue;
383
384 error("pathspec '%s' did not match any file(s) known to git.",
17ddc66e 385 pathspec->items[num].original);
ee425e46
JH
386 errors++;
387 }
0f64bfa9 388 strbuf_release(&sb);
ee425e46
JH
389 return errors;
390}
391
ce8e8804 392static const char * const ls_files_usage[] = {
377adc3a 393 N_("git ls-files [options] [<file>...]"),
ce8e8804
MV
394 NULL
395};
396
397static int option_parse_z(const struct option *opt,
398 const char *arg, int unset)
399{
400 line_terminator = unset ? '\n' : '\0';
401
402 return 0;
403}
404
405static int option_parse_exclude(const struct option *opt,
406 const char *arg, int unset)
407{
72aeb187 408 struct string_list *exclude_list = opt->value;
ce8e8804
MV
409
410 exc_given = 1;
72aeb187 411 string_list_append(exclude_list, arg);
ce8e8804
MV
412
413 return 0;
414}
415
416static int option_parse_exclude_from(const struct option *opt,
417 const char *arg, int unset)
418{
419 struct dir_struct *dir = opt->value;
420
421 exc_given = 1;
422 add_excludes_from_file(dir, arg);
423
424 return 0;
425}
426
427static int option_parse_exclude_standard(const struct option *opt,
428 const char *arg, int unset)
429{
430 struct dir_struct *dir = opt->value;
431
432 exc_given = 1;
433 setup_standard_excludes(dir);
434
435 return 0;
436}
cf9a113d 437
efad1a56 438int cmd_ls_files(int argc, const char **argv, const char *cmd_prefix)
8695c8bf 439{
72aeb187 440 int require_work_tree = 0, show_tag = 0, i;
efad1a56 441 const char *max_prefix;
453ec4bd 442 struct dir_struct dir;
72aeb187
AS
443 struct exclude_list *el;
444 struct string_list exclude_list = STRING_LIST_INIT_NODUP;
ce8e8804
MV
445 struct option builtin_ls_files_options[] = {
446 { OPTION_CALLBACK, 'z', NULL, NULL, NULL,
377adc3a 447 N_("paths are separated with NUL character"),
ce8e8804
MV
448 PARSE_OPT_NOARG, option_parse_z },
449 OPT_BOOLEAN('t', NULL, &show_tag,
377adc3a 450 N_("identify the file status with tags")),
ce8e8804 451 OPT_BOOLEAN('v', NULL, &show_valid_bit,
377adc3a 452 N_("use lowercase letters for 'assume unchanged' files")),
ce8e8804 453 OPT_BOOLEAN('c', "cached", &show_cached,
377adc3a 454 N_("show cached files in the output (default)")),
ce8e8804 455 OPT_BOOLEAN('d', "deleted", &show_deleted,
377adc3a 456 N_("show deleted files in the output")),
ce8e8804 457 OPT_BOOLEAN('m', "modified", &show_modified,
377adc3a 458 N_("show modified files in the output")),
ce8e8804 459 OPT_BOOLEAN('o', "others", &show_others,
377adc3a 460 N_("show other files in the output")),
ce8e8804 461 OPT_BIT('i', "ignored", &dir.flags,
377adc3a 462 N_("show ignored files in the output"),
ce8e8804
MV
463 DIR_SHOW_IGNORED),
464 OPT_BOOLEAN('s', "stage", &show_stage,
377adc3a 465 N_("show staged contents' object name in the output")),
ce8e8804 466 OPT_BOOLEAN('k', "killed", &show_killed,
377adc3a 467 N_("show files on the filesystem that need to be removed")),
ce8e8804 468 OPT_BIT(0, "directory", &dir.flags,
377adc3a 469 N_("show 'other' directories' name only"),
ce8e8804 470 DIR_SHOW_OTHER_DIRECTORIES),
e9008b9a 471 OPT_NEGBIT(0, "empty-directory", &dir.flags,
377adc3a 472 N_("don't show empty directories"),
ce8e8804
MV
473 DIR_HIDE_EMPTY_DIRECTORIES),
474 OPT_BOOLEAN('u', "unmerged", &show_unmerged,
377adc3a 475 N_("show unmerged files in the output")),
9d9a2f4a 476 OPT_BOOLEAN(0, "resolve-undo", &show_resolve_undo,
377adc3a 477 N_("show resolve-undo information")),
a39b15b4 478 { OPTION_CALLBACK, 'x', "exclude", &exclude_list, N_("pattern"),
377adc3a 479 N_("skip files matching pattern"),
ce8e8804 480 0, option_parse_exclude },
377adc3a
NTND
481 { OPTION_CALLBACK, 'X', "exclude-from", &dir, N_("file"),
482 N_("exclude patterns are read from <file>"),
ce8e8804 483 0, option_parse_exclude_from },
377adc3a
NTND
484 OPT_STRING(0, "exclude-per-directory", &dir.exclude_per_dir, N_("file"),
485 N_("read additional per-directory exclude patterns in <file>")),
ce8e8804 486 { OPTION_CALLBACK, 0, "exclude-standard", &dir, NULL,
377adc3a 487 N_("add the standard git exclusions"),
ce8e8804 488 PARSE_OPT_NOARG, option_parse_exclude_standard },
efad1a56 489 { OPTION_SET_INT, 0, "full-name", &prefix_len, NULL,
377adc3a 490 N_("make the output relative to the project top directory"),
ce8e8804
MV
491 PARSE_OPT_NOARG | PARSE_OPT_NONEG, NULL },
492 OPT_BOOLEAN(0, "error-unmatch", &error_unmatch,
377adc3a
NTND
493 N_("if any <file> is not in the index, treat this as an error")),
494 OPT_STRING(0, "with-tree", &with_tree, N_("tree-ish"),
495 N_("pretend that paths removed since <tree-ish> are still present")),
ce8e8804 496 OPT__ABBREV(&abbrev),
377adc3a 497 OPT_BOOLEAN(0, "debug", &debug_mode, N_("show debugging data")),
ce8e8804
MV
498 OPT_END()
499 };
8695c8bf 500
cbb3167e
NTND
501 if (argc == 2 && !strcmp(argv[1], "-h"))
502 usage_with_options(ls_files_usage, builtin_ls_files_options);
503
453ec4bd 504 memset(&dir, 0, sizeof(dir));
efad1a56 505 prefix = cmd_prefix;
5be4efbe 506 if (prefix)
efad1a56 507 prefix_len = strlen(prefix);
ef90d6d4 508 git_config(git_default_config, NULL);
5be4efbe 509
c28b3d6e
NTND
510 if (read_cache() < 0)
511 die("index file corrupt");
512
37782920 513 argc = parse_options(argc, argv, prefix, builtin_ls_files_options,
ce8e8804 514 ls_files_usage, 0);
72aeb187
AS
515 el = add_exclude_list(&dir, EXC_CMDL, "--exclude option");
516 for (i = 0; i < exclude_list.nr; i++) {
517 add_exclude(exclude_list.items[i].string, "", 0, el, --exclude_args);
518 }
ce8e8804
MV
519 if (show_tag || show_valid_bit) {
520 tag_cached = "H ";
521 tag_unmerged = "M ";
522 tag_removed = "R ";
523 tag_modified = "C ";
524 tag_other = "? ";
525 tag_killed = "K ";
44a36913 526 tag_skip_worktree = "S ";
9d9a2f4a 527 tag_resolve_undo = "U ";
9ff768e9 528 }
de2e3b04 529 if (show_modified || show_others || show_deleted || (dir.flags & DIR_SHOW_IGNORED) || show_killed)
ce8e8804
MV
530 require_work_tree = 1;
531 if (show_unmerged)
532 /*
533 * There's no point in showing unmerged unless
534 * you also show the stage information.
535 */
536 show_stage = 1;
537 if (dir.exclude_per_dir)
538 exc_given = 1;
9ff768e9 539
7d8ae932
MH
540 if (require_work_tree && !is_inside_work_tree())
541 setup_work_tree();
6d9ba67b 542
9e06d6ed
NTND
543 parse_pathspec(&pathspec, 0,
544 PATHSPEC_PREFER_CWD |
545 PATHSPEC_STRIP_SUBMODULE_SLASH_CHEAP,
546 prefix, argv);
f3670a57 547
efad1a56 548 /* Find common prefix for all pathspec's */
827f4d6c 549 max_prefix = common_prefix(&pathspec);
8894d535 550 max_prefix_len = max_prefix ? strlen(max_prefix) : 0;
5be4efbe 551
bba319b5 552 /* Treat unmatching pathspec elements as errors */
9e06d6ed
NTND
553 if (pathspec.nr && error_unmatch)
554 ps_matched = xcalloc(1, pathspec.nr);
bba319b5 555
ac78b009
BW
556 if ((dir.flags & DIR_SHOW_IGNORED) && !exc_given)
557 die("ls-files --ignored needs some exclude pattern");
8695c8bf
LT
558
559 /* With no flags, we default to showing the cached files */
0b437a18
RS
560 if (!(show_stage || show_deleted || show_others || show_unmerged ||
561 show_killed || show_modified || show_resolve_undo))
8695c8bf
LT
562 show_cached = 1;
563
efad1a56
CB
564 if (max_prefix)
565 prune_cache(max_prefix);
64586e75
JH
566 if (with_tree) {
567 /*
568 * Basic sanity check; show-stages and show-unmerged
569 * would not make any sense with this option.
570 */
571 if (show_stage || show_unmerged)
572 die("ls-files --with-tree is incompatible with -s or -u");
efad1a56 573 overlay_tree_on_cache(with_tree, max_prefix);
64586e75 574 }
efad1a56 575 show_files(&dir);
9d9a2f4a 576 if (show_resolve_undo)
efad1a56 577 show_ru_info();
bba319b5
JH
578
579 if (ps_matched) {
ee425e46 580 int bad;
17ddc66e 581 bad = report_path_error(ps_matched, &pathspec, prefix);
ee425e46 582 if (bad)
ced7b828
AE
583 fprintf(stderr, "Did you forget to 'git add'?\n");
584
ee425e46 585 return bad ? 1 : 0;
bba319b5
JH
586 }
587
8695c8bf
LT
588 return 0;
589}