ls-files.c 18.2 KB
Newer Older
1 2 3 4 5 6 7 8
/*
 * 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
 */
#include "cache.h"
9
#include "quote.h"
10
#include "dir.h"
P
Peter Eriksen 已提交
11
#include "builtin.h"
12
#include "tree.h"
13
#include "parse-options.h"
J
Junio C Hamano 已提交
14 15
#include "resolve-undo.h"
#include "string-list.h"
16
#include "pathspec.h"
17
#include "run-command.h"
18

19 20 21 22 23 24
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 已提交
25
static int show_resolve_undo;
26 27 28
static int show_modified;
static int show_killed;
static int show_valid_bit;
29
static int line_terminator = '\n';
30
static int debug_mode;
31
static int show_eol;
32
static int recurse_submodules;
33
static struct argv_array submodules_options = ARGV_ARRAY_INIT;
34

35
static const char *prefix;
36
static const char *super_prefix;
37
static int max_prefix_len;
38
static int prefix_len;
39
static struct pathspec pathspec;
40 41
static int error_unmatch;
static char *ps_matched;
42
static const char *with_tree;
43
static int exc_given;
44
static int exclude_args;
45

46 47 48 49
static const char *tag_cached = "";
static const char *tag_unmerged = "";
static const char *tag_removed = "";
static const char *tag_other = "";
50
static const char *tag_killed = "";
51
static const char *tag_modified = "";
52
static const char *tag_skip_worktree = "";
J
Junio C Hamano 已提交
53
static const char *tag_resolve_undo = "";
54

55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71
static void write_eolinfo(const struct cache_entry *ce, const char *path)
{
	if (!show_eol)
		return;
	else {
		struct stat st;
		const char *i_txt = "";
		const char *w_txt = "";
		const char *a_txt = get_convert_attr_ascii(path);
		if (ce && S_ISREG(ce->ce_mode))
			i_txt = get_cached_convert_stats_ascii(ce->name);
		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);
	}
}

72
static void write_name(const char *name)
73
{
74 75 76 77 78 79 80 81 82 83 84
	/*
	 * Prepend the super_prefix to name to construct the full_name to be
	 * written.
	 */
	struct strbuf full_name = STRBUF_INIT;
	if (super_prefix) {
		strbuf_addstr(&full_name, super_prefix);
		strbuf_addstr(&full_name, name);
		name = full_name.buf;
	}

85
	/*
86 87
	 * With "--full-name", prefix_len=0; this caller needs to pass
	 * an empty string in that case (a NULL is good for "").
88
	 */
89 90
	write_name_quoted_relative(name, prefix_len ? prefix : NULL,
				   stdout, line_terminator);
91 92

	strbuf_release(&full_name);
93 94
}

95
static void show_dir_entry(const char *tag, struct dir_entry *ent)
96
{
97
	int len = max_prefix_len;
98 99

	if (len >= ent->len)
100
		die("git ls-files: internal error - directory entry not superset of prefix");
101

102
	if (!dir_path_match(ent, &pathspec, len, ps_matched))
103 104
		return;

105
	fputs(tag, stdout);
106
	write_eolinfo(NULL, ent->name);
107
	write_name(ent->name);
108 109
}

110
static void show_other_files(struct dir_struct *dir)
111 112
{
	int i;
113

114 115
	for (i = 0; i < dir->nr; i++) {
		struct dir_entry *ent = dir->entries[i];
116 117
		if (!cache_name_is_other(ent->name, ent->len))
			continue;
118 119 120 121
		show_dir_entry(tag_other, ent);
	}
}

122
static void show_killed_files(struct dir_struct *dir)
123 124
{
	int i;
125 126
	for (i = 0; i < dir->nr; i++) {
		struct dir_entry *ent = dir->entries[i];
127 128 129 130 131 132 133 134 135 136 137
		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.
				 */
				pos = cache_name_pos(ent->name, ent->len);
				if (0 <= pos)
138 139
					die("BUG: killed-file %.*s not found",
						ent->len, ent->name);
140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167
				pos = -pos - 1;
				while (pos < active_nr &&
				       ce_stage(active_cache[pos]))
					pos++; /* skip unmerged */
				if (active_nr <= pos)
					break;
				/* pos points at a name immediately after
				 * ent->name in the cache.  Does it expect
				 * ent->name to be a directory?
				 */
				len = ce_namelen(active_cache[pos]);
				if ((ent->len < len) &&
				    !strncmp(active_cache[pos]->name,
					     ent->name, ent->len) &&
				    active_cache[pos]->name[ent->len] == '/')
					killed = 1;
				break;
			}
			if (0 <= cache_name_pos(ent->name, sp - ent->name)) {
				/* If any of the leading directories in
				 * ent->name is registered in the cache,
				 * ent->name will be killed.
				 */
				killed = 1;
				break;
			}
		}
		if (killed)
168
			show_dir_entry(tag_killed, dir->entries[i]);
169
	}
170 171
}

172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190
/*
 * Compile an argv_array with all of the options supported by --recurse_submodules
 */
static void compile_submodule_options(const struct dir_struct *dir, int show_tag)
{
	if (line_terminator == '\0')
		argv_array_push(&submodules_options, "-z");
	if (show_tag)
		argv_array_push(&submodules_options, "-t");
	if (show_valid_bit)
		argv_array_push(&submodules_options, "-v");
	if (show_cached)
		argv_array_push(&submodules_options, "--cached");
	if (show_eol)
		argv_array_push(&submodules_options, "--eol");
	if (debug_mode)
		argv_array_push(&submodules_options, "--debug");
}

191 192 193 194 195 196 197
/**
 * Recursively call ls-files on a submodule
 */
static void show_gitlink(const struct cache_entry *ce)
{
	struct child_process cp = CHILD_PROCESS_INIT;
	int status;
198
	int i;
199 200 201 202 203 204 205

	argv_array_pushf(&cp.args, "--super-prefix=%s%s/",
			 super_prefix ? super_prefix : "",
			 ce->name);
	argv_array_push(&cp.args, "ls-files");
	argv_array_push(&cp.args, "--recurse-submodules");

206 207 208
	/* add supported options */
	argv_array_pushv(&cp.args, submodules_options.argv);

209 210 211 212 213 214 215 216 217
	/*
	 * Pass in the original pathspec args.  The submodule will be
	 * responsible for prepending the 'submodule_prefix' prior to comparing
	 * against the pathspec for matches.
	 */
	argv_array_push(&cp.args, "--");
	for (i = 0; i < pathspec.nr; i++)
		argv_array_push(&cp.args, pathspec.items[i].original);

218 219 220 221 222 223 224
	cp.git_cmd = 1;
	cp.dir = ce->name;
	status = run_command(&cp);
	if (status)
		exit(status);
}

225
static void show_ce_entry(const char *tag, const struct cache_entry *ce)
226
{
227
	struct strbuf name = STRBUF_INIT;
228
	int len = max_prefix_len;
229 230 231
	if (super_prefix)
		strbuf_addstr(&name, super_prefix);
	strbuf_addstr(&name, ce->name);
232 233

	if (len >= ce_namelen(ce))
234
		die("git ls-files: internal error - cache entry not superset of prefix");
235

236 237
	if (recurse_submodules && S_ISGITLINK(ce->ce_mode) &&
	    submodule_path_match(&pathspec, name.buf, ps_matched)) {
238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258
		show_gitlink(ce);
	} else if (match_pathspec(&pathspec, name.buf, name.len,
				  len, ps_matched,
				  S_ISDIR(ce->ce_mode) ||
				  S_ISGITLINK(ce->ce_mode))) {
		if (tag && *tag && show_valid_bit &&
		    (ce->ce_flags & CE_VALID)) {
			static char alttag[4];
			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;
		}
259

260 261 262 263 264 265
		if (!show_stage) {
			fputs(tag, stdout);
		} else {
			printf("%s%06o %s %d\t",
			       tag,
			       ce->ce_mode,
266
			       find_unique_abbrev(ce->oid.hash, abbrev),
267 268 269 270 271 272 273 274 275 276 277 278
			       ce_stage(ce));
		}
		write_eolinfo(ce, ce->name);
		write_name(ce->name);
		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);
279 280 281
		}
	}

282
	strbuf_release(&name);
283 284
}

285
static void show_ru_info(void)
J
Junio C Hamano 已提交
286
{
287 288
	struct string_list_item *item;

J
Junio C Hamano 已提交
289 290
	if (!the_index.resolve_undo)
		return;
291 292 293 294 295 296 297 298 299

	for_each_string_list_item(item, the_index.resolve_undo) {
		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 */
300
		if (!match_pathspec(&pathspec, path, len,
301
				    max_prefix_len, ps_matched, 0))
302 303 304 305 306 307 308
			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],
			       find_unique_abbrev(ui->sha1[i], abbrev),
			       i + 1);
309
			write_name(path);
310 311
		}
	}
J
Junio C Hamano 已提交
312 313
}

314
static int ce_excluded(struct dir_struct *dir, const struct cache_entry *ce)
315 316
{
	int dtype = ce_to_dtype(ce);
317
	return is_excluded(dir, ce->name, &dtype);
318 319
}

320
static void show_files(struct dir_struct *dir)
321 322 323 324
{
	int i;

	/* For cached/deleted files we don't need to even do the readdir */
325
	if (show_others || show_killed) {
326 327
		if (!show_others)
			dir->flags |= DIR_COLLECT_KILLED_ONLY;
328
		fill_directory(dir, &pathspec);
329
		if (show_others)
330
			show_other_files(dir);
331
		if (show_killed)
332
			show_killed_files(dir);
333
	}
334
	if (show_cached || show_stage) {
335
		for (i = 0; i < active_nr; i++) {
336
			const struct cache_entry *ce = active_cache[i];
337
			if ((dir->flags & DIR_SHOW_IGNORED) &&
338
			    !ce_excluded(dir, ce))
J
Jeff King 已提交
339
				continue;
340 341
			if (show_unmerged && !ce_stage(ce))
				continue;
342
			if (ce->ce_flags & CE_UPDATE)
343
				continue;
344 345
			show_ce_entry(ce_stage(ce) ? tag_unmerged :
				(ce_skip_worktree(ce) ? tag_skip_worktree : tag_cached), ce);
346 347
		}
	}
348
	if (show_deleted || show_modified) {
349
		for (i = 0; i < active_nr; i++) {
350
			const struct cache_entry *ce = active_cache[i];
351
			struct stat st;
352
			int err;
353
			if ((dir->flags & DIR_SHOW_IGNORED) &&
354
			    !ce_excluded(dir, ce))
J
Jeff King 已提交
355
				continue;
356 357
			if (ce->ce_flags & CE_UPDATE)
				continue;
358 359
			if (ce_skip_worktree(ce))
				continue;
360 361 362
			err = lstat(ce->name, &st);
			if (show_deleted && err)
				show_ce_entry(tag_removed, ce);
363
			if (show_modified && ce_modified(ce, &st, 0))
364
				show_ce_entry(tag_modified, ce);
365 366 367 368 369 370 371
		}
	}
}

/*
 * Prune the index to only contain stuff starting with "prefix"
 */
372
static void prune_cache(const char *prefix, size_t prefixlen)
373
{
374
	int pos;
375 376
	unsigned int first, last;

377 378 379
	if (!prefix)
		return;
	pos = cache_name_pos(prefix, prefixlen);
380 381
	if (pos < 0)
		pos = -pos-1;
382 383
	memmove(active_cache, active_cache + pos,
		(active_nr - pos) * sizeof(struct cache_entry *));
384 385 386 387 388
	active_nr -= pos;
	first = 0;
	last = active_nr;
	while (last > first) {
		int next = (last + first) >> 1;
389
		const struct cache_entry *ce = active_cache[next];
390
		if (!strncmp(ce->name, prefix, prefixlen)) {
391 392
			first = next+1;
			continue;
393
		}
394 395 396 397 398
		last = next;
	}
	active_nr = last;
}

399 400 401 402 403 404 405 406
/*
 * 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.
 */
407
void overlay_tree_on_cache(const char *tree_name, const char *prefix)
408 409 410
{
	struct tree *tree;
	unsigned char sha1[20];
411
	struct pathspec pathspec;
412 413 414 415 416 417 418 419 420 421 422 423 424 425
	struct cache_entry *last_stage0 = NULL;
	int i;

	if (get_sha1(tree_name, sha1))
		die("tree-ish %s not found.", tree_name);
	tree = parse_tree_indirect(sha1);
	if (!tree)
		die("bad tree-ish %s", tree_name);

	/* Hoist the unmerged entries up to stage #3 to make room */
	for (i = 0; i < active_nr; i++) {
		struct cache_entry *ce = active_cache[i];
		if (!ce_stage(ce))
			continue;
426
		ce->ce_flags |= CE_STAGEMASK;
427 428 429
	}

	if (prefix) {
430 431 432 433
		static const char *(matchbuf[1]);
		matchbuf[0] = NULL;
		parse_pathspec(&pathspec, PATHSPEC_ALL_MAGIC,
			       PATHSPEC_PREFER_CWD, prefix, matchbuf);
434
	} else
435
		memset(&pathspec, 0, sizeof(pathspec));
436
	if (read_tree(tree, 1, &pathspec))
437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454
		die("unable to read tree entries %s", tree_name);

	for (i = 0; i < active_nr; i++) {
		struct cache_entry *ce = active_cache[i];
		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))
455
				ce->ce_flags |= CE_UPDATE;
456 457 458 459
		}
	}
}

460
static const char * const ls_files_usage[] = {
461
	N_("git ls-files [<options>] [<file>...]"),
462 463 464 465 466 467
	NULL
};

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

	exc_given = 1;
471
	string_list_append(exclude_list, arg);
472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496

	return 0;
}

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

	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;

	exc_given = 1;
	setup_standard_excludes(dir);

	return 0;
}
497

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

564 565 566
	if (argc == 2 && !strcmp(argv[1], "-h"))
		usage_with_options(ls_files_usage, builtin_ls_files_options);

567
	memset(&dir, 0, sizeof(dir));
568
	prefix = cmd_prefix;
569
	if (prefix)
570
		prefix_len = strlen(prefix);
571
	super_prefix = get_super_prefix();
572
	git_config(git_default_config, NULL);
573

574 575 576
	if (read_cache() < 0)
		die("index file corrupt");

577
	argc = parse_options(argc, argv, prefix, builtin_ls_files_options,
578
			ls_files_usage, 0);
579 580 581 582
	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);
	}
583 584 585 586 587 588 589
	if (show_tag || show_valid_bit) {
		tag_cached = "H ";
		tag_unmerged = "M ";
		tag_removed = "R ";
		tag_modified = "C ";
		tag_other = "? ";
		tag_killed = "K ";
590
		tag_skip_worktree = "S ";
J
Junio C Hamano 已提交
591
		tag_resolve_undo = "U ";
592
	}
593
	if (show_modified || show_others || show_deleted || (dir.flags & DIR_SHOW_IGNORED) || show_killed)
594 595 596 597 598 599 600 601 602
		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;
603

604 605
	if (require_work_tree && !is_inside_work_tree())
		setup_work_tree();
606

607 608 609
	if (recurse_submodules)
		compile_submodule_options(&dir, show_tag);

610 611
	if (recurse_submodules &&
	    (show_stage || show_deleted || show_others || show_unmerged ||
612
	     show_killed || show_modified || show_resolve_undo || with_tree))
613 614 615 616 617 618
		die("ls-files --recurse-submodules unsupported mode");

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

619 620 621 622
	parse_pathspec(&pathspec, 0,
		       PATHSPEC_PREFER_CWD |
		       PATHSPEC_STRIP_SUBMODULE_SLASH_CHEAP,
		       prefix, argv);
623

624 625 626 627 628 629 630 631 632
	/*
	 * Find common prefix for all pathspec's
	 * This is used as a performance optimization which unfortunately cannot
	 * be done when recursing into submodules
	 */
	if (recurse_submodules)
		max_prefix = NULL;
	else
		max_prefix = common_prefix(&pathspec);
633
	max_prefix_len = max_prefix ? strlen(max_prefix) : 0;
634

635
	/* Treat unmatching pathspec elements as errors */
636
	if (pathspec.nr && error_unmatch)
637
		ps_matched = xcalloc(pathspec.nr, 1);
638

639 640
	if ((dir.flags & DIR_SHOW_IGNORED) && !exc_given)
		die("ls-files --ignored needs some exclude pattern");
641 642

	/* With no flags, we default to showing the cached files */
643 644
	if (!(show_stage || show_deleted || show_others || show_unmerged ||
	      show_killed || show_modified || show_resolve_undo))
645 646
		show_cached = 1;

647
	prune_cache(max_prefix, max_prefix_len);
648 649 650 651 652 653 654
	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");
655
		overlay_tree_on_cache(with_tree, max_prefix);
656
	}
657
	show_files(&dir);
J
Junio C Hamano 已提交
658
	if (show_resolve_undo)
659
		show_ru_info();
660 661

	if (ps_matched) {
662
		int bad;
663
		bad = report_path_error(ps_matched, &pathspec, prefix);
664
		if (bad)
665 666
			fprintf(stderr, "Did you forget to 'git add'?\n");

667
		return bad ? 1 : 0;
668 669
	}

670 671
	return 0;
}