ls-files.c 19.0 KB
Newer Older
1 2 3 4 5 6 7
/*
 * This merges the file listing in the directory cache index
 * with the actual working directory list, and shows different
 * combinations of the two.
 *
 * Copyright (C) Linus Torvalds, 2005
 */
8
#define NO_THE_INDEX_COMPATIBILITY_MACROS
9
#include "cache.h"
10
#include "repository.h"
11
#include "config.h"
12
#include "quote.h"
13
#include "dir.h"
P
Peter Eriksen 已提交
14
#include "builtin.h"
15
#include "tree.h"
16
#include "parse-options.h"
J
Junio C Hamano 已提交
17 18
#include "resolve-undo.h"
#include "string-list.h"
19
#include "pathspec.h"
20
#include "run-command.h"
21
#include "submodule.h"
22
#include "submodule-config.h"
23

24 25 26 27 28 29
static int abbrev;
static int show_deleted;
static int show_cached;
static int show_others;
static int show_stage;
static int show_unmerged;
J
Junio C Hamano 已提交
30
static int show_resolve_undo;
31 32 33
static int show_modified;
static int show_killed;
static int show_valid_bit;
34
static int show_fsmonitor_bit;
35
static int line_terminator = '\n';
36
static int debug_mode;
37
static int show_eol;
38
static int recurse_submodules;
39

40 41
static const char *prefix;
static int max_prefix_len;
42
static int prefix_len;
43
static struct pathspec pathspec;
44 45
static int error_unmatch;
static char *ps_matched;
46
static const char *with_tree;
47
static int exc_given;
48
static int exclude_args;
49

50 51 52 53
static const char *tag_cached = "";
static const char *tag_unmerged = "";
static const char *tag_removed = "";
static const char *tag_other = "";
54
static const char *tag_killed = "";
55
static const char *tag_modified = "";
56
static const char *tag_skip_worktree = "";
J
Junio C Hamano 已提交
57
static const char *tag_resolve_undo = "";
58

59 60
static void write_eolinfo(const struct index_state *istate,
			  const struct cache_entry *ce, const char *path)
61
{
62
	if (show_eol) {
63 64 65
		struct stat st;
		const char *i_txt = "";
		const char *w_txt = "";
66
		const char *a_txt = get_convert_attr_ascii(istate, path);
67
		if (ce && S_ISREG(ce->ce_mode))
68
			i_txt = get_cached_convert_stats_ascii(istate,
69
							       ce->name);
70 71 72 73 74 75
		if (!lstat(path, &st) && S_ISREG(st.st_mode))
			w_txt = get_wt_convert_stats_ascii(path);
		printf("i/%-5s w/%-5s attr/%-17s\t", i_txt, w_txt, a_txt);
	}
}

76
static void write_name(const char *name)
77
{
78
	/*
79 80
	 * With "--full-name", prefix_len=0; this caller needs to pass
	 * an empty string in that case (a NULL is good for "").
81
	 */
82 83
	write_name_quoted_relative(name, prefix_len ? prefix : NULL,
				   stdout, line_terminator);
84 85
}

86 87 88 89
static const char *get_tag(const struct cache_entry *ce, const char *tag)
{
	static char alttag[4];

90 91
	if (tag && *tag && ((show_valid_bit && (ce->ce_flags & CE_VALID)) ||
		(show_fsmonitor_bit && (ce->ce_flags & CE_FSMONITOR_VALID)))) {
92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110
		memcpy(alttag, tag, 3);

		if (isalpha(tag[0])) {
			alttag[0] = tolower(tag[0]);
		} else if (tag[0] == '?') {
			alttag[0] = '!';
		} else {
			alttag[0] = 'v';
			alttag[1] = tag[0];
			alttag[2] = ' ';
			alttag[3] = 0;
		}

		tag = alttag;
	}

	return tag;
}

111 112 113 114 115 116 117 118 119 120 121 122 123
static void print_debug(const struct cache_entry *ce)
{
	if (debug_mode) {
		const struct stat_data *sd = &ce->ce_stat_data;

		printf("  ctime: %d:%d\n", sd->sd_ctime.sec, sd->sd_ctime.nsec);
		printf("  mtime: %d:%d\n", sd->sd_mtime.sec, sd->sd_mtime.nsec);
		printf("  dev: %d\tino: %d\n", sd->sd_dev, sd->sd_ino);
		printf("  uid: %d\tgid: %d\n", sd->sd_uid, sd->sd_gid);
		printf("  size: %d\tflags: %x\n", sd->sd_size, ce->ce_flags);
	}
}

124 125
static void show_dir_entry(const struct index_state *istate,
			   const char *tag, struct dir_entry *ent)
126
{
127
	int len = max_prefix_len;
128

129
	if (len > ent->len)
130
		die("git ls-files: internal error - directory entry not superset of prefix");
131

132
	if (!dir_path_match(istate, ent, &pathspec, len, ps_matched))
133 134
		return;

135
	fputs(tag, stdout);
136
	write_eolinfo(istate, NULL, ent->name);
137
	write_name(ent->name);
138 139
}

140 141
static void show_other_files(const struct index_state *istate,
			     const struct dir_struct *dir)
142 143
{
	int i;
144

145 146
	for (i = 0; i < dir->nr; i++) {
		struct dir_entry *ent = dir->entries[i];
147
		if (!index_name_is_other(istate, ent->name, ent->len))
148
			continue;
149
		show_dir_entry(istate, tag_other, ent);
150 151 152
	}
}

153 154
static void show_killed_files(const struct index_state *istate,
			      const struct dir_struct *dir)
155 156
{
	int i;
157 158
	for (i = 0; i < dir->nr; i++) {
		struct dir_entry *ent = dir->entries[i];
159 160 161 162 163 164 165 166 167
		char *cp, *sp;
		int pos, len, killed = 0;

		for (cp = ent->name; cp - ent->name < ent->len; cp = sp + 1) {
			sp = strchr(cp, '/');
			if (!sp) {
				/* If ent->name is prefix of an entry in the
				 * cache, it will be killed.
				 */
168
				pos = index_name_pos(istate, ent->name, ent->len);
169
				if (0 <= pos)
170
					BUG("killed-file %.*s not found",
171
						ent->len, ent->name);
172
				pos = -pos - 1;
173 174
				while (pos < istate->cache_nr &&
				       ce_stage(istate->cache[pos]))
175
					pos++; /* skip unmerged */
176
				if (istate->cache_nr <= pos)
177 178 179 180 181
					break;
				/* pos points at a name immediately after
				 * ent->name in the cache.  Does it expect
				 * ent->name to be a directory?
				 */
182
				len = ce_namelen(istate->cache[pos]);
183
				if ((ent->len < len) &&
184
				    !strncmp(istate->cache[pos]->name,
185
					     ent->name, ent->len) &&
186
				    istate->cache[pos]->name[ent->len] == '/')
187 188 189
					killed = 1;
				break;
			}
190
			if (0 <= index_name_pos(istate, ent->name, sp - ent->name)) {
191 192 193 194 195 196 197 198 199
				/* If any of the leading directories in
				 * ent->name is registered in the cache,
				 * ent->name will be killed.
				 */
				killed = 1;
				break;
			}
		}
		if (killed)
200
			show_dir_entry(istate, tag_killed, dir->entries[i]);
201
	}
202 203
}

204
static void show_files(struct repository *repo, struct dir_struct *dir);
205

206 207
static void show_submodule(struct repository *superproject,
			   struct dir_struct *dir, const char *path)
208
{
209 210 211 212 213 214 215 216 217 218 219
	struct repository submodule;

	if (repo_submodule_init(&submodule, superproject, path))
		return;

	if (repo_read_index(&submodule) < 0)
		die("index file corrupt");

	show_files(&submodule, dir);

	repo_clear(&submodule);
220 221
}

222 223 224
static void show_ce(struct repository *repo, struct dir_struct *dir,
		    const struct cache_entry *ce, const char *fullname,
		    const char *tag)
225
{
226
	if (max_prefix_len > strlen(fullname))
227
		die("git ls-files: internal error - cache entry not superset of prefix");
228

229
	if (recurse_submodules && S_ISGITLINK(ce->ce_mode) &&
230 231
	    is_submodule_active(repo, ce->name)) {
		show_submodule(repo, dir, ce->name);
232
	} else if (match_pathspec(repo->index, &pathspec, fullname, strlen(fullname),
233
				  max_prefix_len, ps_matched,
234 235
				  S_ISDIR(ce->ce_mode) ||
				  S_ISGITLINK(ce->ce_mode))) {
236
		tag = get_tag(ce, tag);
237

238 239 240 241 242 243
		if (!show_stage) {
			fputs(tag, stdout);
		} else {
			printf("%s%06o %s %d\t",
			       tag,
			       ce->ce_mode,
244
			       find_unique_abbrev(&ce->oid, abbrev),
245 246
			       ce_stage(ce));
		}
247 248
		write_eolinfo(repo->index, ce, fullname);
		write_name(fullname);
249
		print_debug(ce);
250
	}
251 252
}

253
static void show_ru_info(const struct index_state *istate)
J
Junio C Hamano 已提交
254
{
255 256
	struct string_list_item *item;

257
	if (!istate->resolve_undo)
J
Junio C Hamano 已提交
258
		return;
259

260
	for_each_string_list_item(item, istate->resolve_undo) {
261 262 263 264 265 266 267
		const char *path = item->string;
		struct resolve_undo_info *ui = item->util;
		int i, len;

		len = strlen(path);
		if (len < max_prefix_len)
			continue; /* outside of the prefix */
268
		if (!match_pathspec(istate, &pathspec, path, len,
269
				    max_prefix_len, ps_matched, 0))
270 271 272 273 274
			continue; /* uninterested */
		for (i = 0; i < 3; i++) {
			if (!ui->mode[i])
				continue;
			printf("%s%06o %s %d\t", tag_resolve_undo, ui->mode[i],
275
			       find_unique_abbrev(&ui->oid[i], abbrev),
276
			       i + 1);
277
			write_name(path);
278 279
		}
	}
J
Junio C Hamano 已提交
280 281
}

282
static int ce_excluded(struct dir_struct *dir, struct index_state *istate,
283
		       const char *fullname, const struct cache_entry *ce)
284 285
{
	int dtype = ce_to_dtype(ce);
286 287 288 289 290 291 292 293 294 295
	return is_excluded(dir, istate, fullname, &dtype);
}

static void construct_fullname(struct strbuf *out, const struct repository *repo,
			       const struct cache_entry *ce)
{
	strbuf_reset(out);
	if (repo->submodule_prefix)
		strbuf_addstr(out, repo->submodule_prefix);
	strbuf_addstr(out, ce->name);
296 297
}

298
static void show_files(struct repository *repo, struct dir_struct *dir)
299 300
{
	int i;
301
	struct strbuf fullname = STRBUF_INIT;
302 303

	/* For cached/deleted files we don't need to even do the readdir */
304
	if (show_others || show_killed) {
305 306
		if (!show_others)
			dir->flags |= DIR_COLLECT_KILLED_ONLY;
307
		fill_directory(dir, repo->index, &pathspec);
308
		if (show_others)
309
			show_other_files(repo->index, dir);
310
		if (show_killed)
311
			show_killed_files(repo->index, dir);
312
	}
313
	if (show_cached || show_stage) {
314 315 316 317 318
		for (i = 0; i < repo->index->cache_nr; i++) {
			const struct cache_entry *ce = repo->index->cache[i];

			construct_fullname(&fullname, repo, ce);

319
			if ((dir->flags & DIR_SHOW_IGNORED) &&
320
			    !ce_excluded(dir, repo->index, fullname.buf, ce))
J
Jeff King 已提交
321
				continue;
322 323
			if (show_unmerged && !ce_stage(ce))
				continue;
324
			if (ce->ce_flags & CE_UPDATE)
325
				continue;
326 327 328 329
			show_ce(repo, dir, ce, fullname.buf,
				ce_stage(ce) ? tag_unmerged :
				(ce_skip_worktree(ce) ? tag_skip_worktree :
				 tag_cached));
330 331
		}
	}
332
	if (show_deleted || show_modified) {
333 334
		for (i = 0; i < repo->index->cache_nr; i++) {
			const struct cache_entry *ce = repo->index->cache[i];
335
			struct stat st;
336
			int err;
337 338 339

			construct_fullname(&fullname, repo, ce);

340
			if ((dir->flags & DIR_SHOW_IGNORED) &&
341
			    !ce_excluded(dir, repo->index, fullname.buf, ce))
J
Jeff King 已提交
342
				continue;
343 344
			if (ce->ce_flags & CE_UPDATE)
				continue;
345 346
			if (ce_skip_worktree(ce))
				continue;
347
			err = lstat(fullname.buf, &st);
348
			if (show_deleted && err)
349 350 351
				show_ce(repo, dir, ce, fullname.buf, tag_removed);
			if (show_modified && ie_modified(repo->index, ce, &st, 0))
				show_ce(repo, dir, ce, fullname.buf, tag_modified);
352 353
		}
	}
354 355

	strbuf_release(&fullname);
356 357 358 359 360
}

/*
 * Prune the index to only contain stuff starting with "prefix"
 */
361 362
static void prune_index(struct index_state *istate,
			const char *prefix, size_t prefixlen)
363
{
364
	int pos;
365 366
	unsigned int first, last;

367
	if (!prefix || !istate->cache_nr)
368
		return;
369
	pos = index_name_pos(istate, prefix, prefixlen);
370 371
	if (pos < 0)
		pos = -pos-1;
372
	first = pos;
373
	last = istate->cache_nr;
374 375
	while (last > first) {
		int next = (last + first) >> 1;
376
		const struct cache_entry *ce = istate->cache[next];
377
		if (!strncmp(ce->name, prefix, prefixlen)) {
378 379
			first = next+1;
			continue;
380
		}
381 382
		last = next;
	}
R
René Scharfe 已提交
383
	MOVE_ARRAY(istate->cache, istate->cache + pos, last - pos);
384
	istate->cache_nr = last - pos;
385 386
}

387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405
static int get_common_prefix_len(const char *common_prefix)
{
	int common_prefix_len;

	if (!common_prefix)
		return 0;

	common_prefix_len = strlen(common_prefix);

	/*
	 * If the prefix has a trailing slash, strip it so that submodules wont
	 * be pruned from the index.
	 */
	if (common_prefix[common_prefix_len - 1] == '/')
		common_prefix_len--;

	return common_prefix_len;
}

406 407 408 409 410 411 412 413
/*
 * Read the tree specified with --with-tree option
 * (typically, HEAD) into stage #1 and then
 * squash them down to stage #0.  This is used for
 * --error-unmatch to list and check the path patterns
 * that were given from the command line.  We are not
 * going to write this index out.
 */
414 415
void overlay_tree_on_index(struct index_state *istate,
			   const char *tree_name, const char *prefix)
416 417
{
	struct tree *tree;
418
	struct object_id oid;
419
	struct pathspec pathspec;
420 421 422
	struct cache_entry *last_stage0 = NULL;
	int i;

423
	if (get_oid(tree_name, &oid))
424
		die("tree-ish %s not found.", tree_name);
425
	tree = parse_tree_indirect(&oid);
426 427 428 429
	if (!tree)
		die("bad tree-ish %s", tree_name);

	/* Hoist the unmerged entries up to stage #3 to make room */
430 431
	for (i = 0; i < istate->cache_nr; i++) {
		struct cache_entry *ce = istate->cache[i];
432 433
		if (!ce_stage(ce))
			continue;
434
		ce->ce_flags |= CE_STAGEMASK;
435 436 437
	}

	if (prefix) {
438 439 440 441
		static const char *(matchbuf[1]);
		matchbuf[0] = NULL;
		parse_pathspec(&pathspec, PATHSPEC_ALL_MAGIC,
			       PATHSPEC_PREFER_CWD, prefix, matchbuf);
442
	} else
443
		memset(&pathspec, 0, sizeof(pathspec));
444
	if (read_tree(tree, 1, &pathspec, istate))
445 446
		die("unable to read tree entries %s", tree_name);

447 448
	for (i = 0; i < istate->cache_nr; i++) {
		struct cache_entry *ce = istate->cache[i];
449 450 451 452 453 454 455 456 457 458 459 460 461 462
		switch (ce_stage(ce)) {
		case 0:
			last_stage0 = ce;
			/* fallthru */
		default:
			continue;
		case 1:
			/*
			 * If there is stage #0 entry for this, we do not
			 * need to show it.  We use CE_UPDATE bit to mark
			 * such an entry.
			 */
			if (last_stage0 &&
			    !strcmp(last_stage0->name, ce->name))
463
				ce->ce_flags |= CE_UPDATE;
464 465 466 467
		}
	}
}

468
static const char * const ls_files_usage[] = {
469
	N_("git ls-files [<options>] [<file>...]"),
470 471 472 473 474 475
	NULL
};

static int option_parse_exclude(const struct option *opt,
				const char *arg, int unset)
{
476
	struct string_list *exclude_list = opt->value;
477

478 479
	BUG_ON_OPT_NEG(unset);

480
	exc_given = 1;
481
	string_list_append(exclude_list, arg);
482 483 484 485 486 487 488 489 490

	return 0;
}

static int option_parse_exclude_from(const struct option *opt,
				     const char *arg, int unset)
{
	struct dir_struct *dir = opt->value;

491 492
	BUG_ON_OPT_NEG(unset);

493 494 495 496 497 498 499 500 501 502 503
	exc_given = 1;
	add_excludes_from_file(dir, arg);

	return 0;
}

static int option_parse_exclude_standard(const struct option *opt,
					 const char *arg, int unset)
{
	struct dir_struct *dir = opt->value;

504 505 506
	BUG_ON_OPT_NEG(unset);
	BUG_ON_OPT_ARG(arg);

507 508 509 510 511
	exc_given = 1;
	setup_standard_excludes(dir);

	return 0;
}
512

513
int cmd_ls_files(int argc, const char **argv, const char *cmd_prefix)
514
{
515
	int require_work_tree = 0, show_tag = 0, i;
516
	const char *max_prefix;
517
	struct dir_struct dir;
518 519
	struct exclude_list *el;
	struct string_list exclude_list = STRING_LIST_INIT_NODUP;
520
	struct option builtin_ls_files_options[] = {
521 522 523
		/* Think twice before adding "--nul" synonym to this */
		OPT_SET_INT('z', NULL, &line_terminator,
			N_("paths are separated with NUL character"), '\0'),
524
		OPT_BOOL('t', NULL, &show_tag,
525
			N_("identify the file status with tags")),
526
		OPT_BOOL('v', NULL, &show_valid_bit,
527
			N_("use lowercase letters for 'assume unchanged' files")),
528 529
		OPT_BOOL('f', NULL, &show_fsmonitor_bit,
			N_("use lowercase letters for 'fsmonitor clean' files")),
530
		OPT_BOOL('c', "cached", &show_cached,
531
			N_("show cached files in the output (default)")),
532
		OPT_BOOL('d', "deleted", &show_deleted,
533
			N_("show deleted files in the output")),
534
		OPT_BOOL('m', "modified", &show_modified,
535
			N_("show modified files in the output")),
536
		OPT_BOOL('o', "others", &show_others,
537
			N_("show other files in the output")),
538
		OPT_BIT('i', "ignored", &dir.flags,
539
			N_("show ignored files in the output"),
540
			DIR_SHOW_IGNORED),
541
		OPT_BOOL('s', "stage", &show_stage,
542
			N_("show staged contents' object name in the output")),
543
		OPT_BOOL('k', "killed", &show_killed,
544
			N_("show files on the filesystem that need to be removed")),
545
		OPT_BIT(0, "directory", &dir.flags,
A
Alex Henrie 已提交
546
			N_("show 'other' directories' names only"),
547
			DIR_SHOW_OTHER_DIRECTORIES),
548
		OPT_BOOL(0, "eol", &show_eol, N_("show line endings of files")),
J
Jeff King 已提交
549
		OPT_NEGBIT(0, "empty-directory", &dir.flags,
550
			N_("don't show empty directories"),
551
			DIR_HIDE_EMPTY_DIRECTORIES),
552
		OPT_BOOL('u', "unmerged", &show_unmerged,
553
			N_("show unmerged files in the output")),
554
		OPT_BOOL(0, "resolve-undo", &show_resolve_undo,
555
			    N_("show resolve-undo information")),
J
Junio C Hamano 已提交
556
		{ OPTION_CALLBACK, 'x', "exclude", &exclude_list, N_("pattern"),
557
			N_("skip files matching pattern"),
558
			PARSE_OPT_NONEG, option_parse_exclude },
559 560
		{ OPTION_CALLBACK, 'X', "exclude-from", &dir, N_("file"),
			N_("exclude patterns are read from <file>"),
561
			PARSE_OPT_NONEG, option_parse_exclude_from },
562 563
		OPT_STRING(0, "exclude-per-directory", &dir.exclude_per_dir, N_("file"),
			N_("read additional per-directory exclude patterns in <file>")),
564
		{ OPTION_CALLBACK, 0, "exclude-standard", &dir, NULL,
565
			N_("add the standard git exclusions"),
566 567
			PARSE_OPT_NOARG | PARSE_OPT_NONEG,
			option_parse_exclude_standard },
568 569 570
		OPT_SET_INT_F(0, "full-name", &prefix_len,
			      N_("make the output relative to the project top directory"),
			      0, PARSE_OPT_NONEG),
571 572
		OPT_BOOL(0, "recurse-submodules", &recurse_submodules,
			N_("recurse through submodules")),
573
		OPT_BOOL(0, "error-unmatch", &error_unmatch,
574 575 576
			N_("if any <file> is not in the index, treat this as an error")),
		OPT_STRING(0, "with-tree", &with_tree, N_("tree-ish"),
			N_("pretend that paths removed since <tree-ish> are still present")),
577
		OPT__ABBREV(&abbrev),
578
		OPT_BOOL(0, "debug", &debug_mode, N_("show debugging data")),
579 580
		OPT_END()
	};
581

582 583 584
	if (argc == 2 && !strcmp(argv[1], "-h"))
		usage_with_options(ls_files_usage, builtin_ls_files_options);

585
	memset(&dir, 0, sizeof(dir));
586
	prefix = cmd_prefix;
587
	if (prefix)
588
		prefix_len = strlen(prefix);
589
	git_config(git_default_config, NULL);
590

591
	if (repo_read_index(the_repository) < 0)
592 593
		die("index file corrupt");

594
	argc = parse_options(argc, argv, prefix, builtin_ls_files_options,
595
			ls_files_usage, 0);
596 597 598 599
	el = add_exclude_list(&dir, EXC_CMDL, "--exclude option");
	for (i = 0; i < exclude_list.nr; i++) {
		add_exclude(exclude_list.items[i].string, "", 0, el, --exclude_args);
	}
600
	if (show_tag || show_valid_bit || show_fsmonitor_bit) {
601 602 603 604 605 606
		tag_cached = "H ";
		tag_unmerged = "M ";
		tag_removed = "R ";
		tag_modified = "C ";
		tag_other = "? ";
		tag_killed = "K ";
607
		tag_skip_worktree = "S ";
J
Junio C Hamano 已提交
608
		tag_resolve_undo = "U ";
609
	}
610
	if (show_modified || show_others || show_deleted || (dir.flags & DIR_SHOW_IGNORED) || show_killed)
611 612 613 614 615 616 617 618 619
		require_work_tree = 1;
	if (show_unmerged)
		/*
		 * There's no point in showing unmerged unless
		 * you also show the stage information.
		 */
		show_stage = 1;
	if (dir.exclude_per_dir)
		exc_given = 1;
620

621 622
	if (require_work_tree && !is_inside_work_tree())
		setup_work_tree();
623

624 625
	if (recurse_submodules &&
	    (show_stage || show_deleted || show_others || show_unmerged ||
626
	     show_killed || show_modified || show_resolve_undo || with_tree))
627 628 629 630 631 632
		die("ls-files --recurse-submodules unsupported mode");

	if (recurse_submodules && error_unmatch)
		die("ls-files --recurse-submodules does not support "
		    "--error-unmatch");

633
	parse_pathspec(&pathspec, 0,
634
		       PATHSPEC_PREFER_CWD,
635
		       prefix, argv);
636

637 638 639
	/*
	 * Find common prefix for all pathspec's
	 * This is used as a performance optimization which unfortunately cannot
640 641 642 643
	 * be done when recursing into submodules because when a pathspec is
	 * given which spans repository boundaries you can't simply remove the
	 * submodule entry because the pathspec may match something inside the
	 * submodule.
644 645 646 647 648
	 */
	if (recurse_submodules)
		max_prefix = NULL;
	else
		max_prefix = common_prefix(&pathspec);
649 650
	max_prefix_len = get_common_prefix_len(max_prefix);

651
	prune_index(the_repository->index, max_prefix, max_prefix_len);
652

653
	/* Treat unmatching pathspec elements as errors */
654
	if (pathspec.nr && error_unmatch)
655
		ps_matched = xcalloc(pathspec.nr, 1);
656

657 658
	if ((dir.flags & DIR_SHOW_IGNORED) && !exc_given)
		die("ls-files --ignored needs some exclude pattern");
659 660

	/* With no flags, we default to showing the cached files */
661 662
	if (!(show_stage || show_deleted || show_others || show_unmerged ||
	      show_killed || show_modified || show_resolve_undo))
663 664
		show_cached = 1;

665 666 667 668 669 670 671
	if (with_tree) {
		/*
		 * Basic sanity check; show-stages and show-unmerged
		 * would not make any sense with this option.
		 */
		if (show_stage || show_unmerged)
			die("ls-files --with-tree is incompatible with -s or -u");
672
		overlay_tree_on_index(the_repository->index, with_tree, max_prefix);
673
	}
674 675 676

	show_files(the_repository, &dir);

J
Junio C Hamano 已提交
677
	if (show_resolve_undo)
678
		show_ru_info(the_repository->index);
679 680

	if (ps_matched) {
681
		int bad;
682
		bad = report_path_error(ps_matched, &pathspec, prefix);
683
		if (bad)
684 685
			fprintf(stderr, "Did you forget to 'git add'?\n");

686
		return bad ? 1 : 0;
687 688
	}

689
	UNLEAK(dir);
690 691
	return 0;
}