ls-files.c 18.9 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
#include "submodule.h"
19

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

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

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

56 57
static void write_eolinfo(const struct index_state *istate,
			  const struct cache_entry *ce, const char *path)
58
{
59
	if (show_eol) {
60 61 62 63 64
		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))
65
			i_txt = get_cached_convert_stats_ascii(istate,
66
							       ce->name);
67 68 69 70 71 72
		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);
	}
}

73
static void write_name(const char *name)
74
{
75 76 77 78 79 80 81 82 83 84 85
	/*
	 * 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;
	}

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

	strbuf_release(&full_name);
94 95
}

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

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

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

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

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

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

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

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

	/* Add Pathspecs */
	argv_array_push(&submodule_options, "--");
	for (; *argv; argv++)
		argv_array_push(&submodule_options, *argv);
198 199
}

200 201 202 203 204 205 206
/**
 * 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;
207
	char *dir;
208

209 210 211
	prepare_submodule_repo_env(&cp.env_array);
	argv_array_push(&cp.env_array, GIT_DIR_ENVIRONMENT);

212 213 214 215
	if (prefix_len)
		argv_array_pushf(&cp.env_array, "%s=%s",
				 GIT_TOPLEVEL_PREFIX_ENVIRONMENT,
				 prefix);
216 217 218 219 220 221
	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");

222
	/* add supported options */
223
	argv_array_pushv(&cp.args, submodule_options.argv);
224

225
	cp.git_cmd = 1;
226 227
	dir = mkpathdup("%s/%s", get_git_work_tree(), ce->name);
	cp.dir = dir;
228
	status = run_command(&cp);
229
	free(dir);
230 231 232 233
	if (status)
		exit(status);
}

234
static void show_ce_entry(const char *tag, const struct cache_entry *ce)
235
{
236
	struct strbuf name = STRBUF_INIT;
237
	int len = max_prefix_len;
238 239 240
	if (super_prefix)
		strbuf_addstr(&name, super_prefix);
	strbuf_addstr(&name, ce->name);
241

242
	if (len > ce_namelen(ce))
243
		die("git ls-files: internal error - cache entry not superset of prefix");
244

245 246
	if (recurse_submodules && S_ISGITLINK(ce->ce_mode) &&
	    submodule_path_match(&pathspec, name.buf, ps_matched)) {
247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267
		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;
		}
268

269 270 271 272 273 274
		if (!show_stage) {
			fputs(tag, stdout);
		} else {
			printf("%s%06o %s %d\t",
			       tag,
			       ce->ce_mode,
275
			       find_unique_abbrev(ce->oid.hash, abbrev),
276 277
			       ce_stage(ce));
		}
278
		write_eolinfo(&the_index, ce, ce->name);
279 280 281 282 283 284 285 286 287
		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);
288 289 290
		}
	}

291
	strbuf_release(&name);
292 293
}

294
static void show_ru_info(void)
J
Junio C Hamano 已提交
295
{
296 297
	struct string_list_item *item;

J
Junio C Hamano 已提交
298 299
	if (!the_index.resolve_undo)
		return;
300 301 302 303 304 305 306 307 308

	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 */
309
		if (!match_pathspec(&pathspec, path, len,
310
				    max_prefix_len, ps_matched, 0))
311 312 313 314 315 316 317
			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);
318
			write_name(path);
319 320
		}
	}
J
Junio C Hamano 已提交
321 322
}

323
static int ce_excluded(struct dir_struct *dir, const struct cache_entry *ce)
324 325
{
	int dtype = ce_to_dtype(ce);
326
	return is_excluded(dir, &the_index, ce->name, &dtype);
327 328
}

329
static void show_files(struct dir_struct *dir)
330 331 332 333
{
	int i;

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

/*
 * Prune the index to only contain stuff starting with "prefix"
 */
381
static void prune_cache(const char *prefix, size_t prefixlen)
382
{
383
	int pos;
384 385
	unsigned int first, last;

386 387 388
	if (!prefix)
		return;
	pos = cache_name_pos(prefix, prefixlen);
389 390
	if (pos < 0)
		pos = -pos-1;
391
	first = pos;
392 393 394
	last = active_nr;
	while (last > first) {
		int next = (last + first) >> 1;
395
		const struct cache_entry *ce = active_cache[next];
396
		if (!strncmp(ce->name, prefix, prefixlen)) {
397 398
			first = next+1;
			continue;
399
		}
400 401
		last = next;
	}
402 403 404
	memmove(active_cache, active_cache + pos,
		(last - pos) * sizeof(struct cache_entry *));
	active_nr = last - pos;
405 406
}

407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425
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;
}

426 427 428 429 430 431 432 433
/*
 * 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.
 */
434 435
void overlay_tree_on_index(struct index_state *istate,
			   const char *tree_name, const char *prefix)
436 437
{
	struct tree *tree;
438
	struct object_id oid;
439
	struct pathspec pathspec;
440 441 442
	struct cache_entry *last_stage0 = NULL;
	int i;

443
	if (get_oid(tree_name, &oid))
444
		die("tree-ish %s not found.", tree_name);
445
	tree = parse_tree_indirect(&oid);
446 447 448 449
	if (!tree)
		die("bad tree-ish %s", tree_name);

	/* Hoist the unmerged entries up to stage #3 to make room */
450 451
	for (i = 0; i < istate->cache_nr; i++) {
		struct cache_entry *ce = istate->cache[i];
452 453
		if (!ce_stage(ce))
			continue;
454
		ce->ce_flags |= CE_STAGEMASK;
455 456 457
	}

	if (prefix) {
458 459 460 461
		static const char *(matchbuf[1]);
		matchbuf[0] = NULL;
		parse_pathspec(&pathspec, PATHSPEC_ALL_MAGIC,
			       PATHSPEC_PREFER_CWD, prefix, matchbuf);
462
	} else
463
		memset(&pathspec, 0, sizeof(pathspec));
464
	if (read_tree(tree, 1, &pathspec, istate))
465 466
		die("unable to read tree entries %s", tree_name);

467 468
	for (i = 0; i < istate->cache_nr; i++) {
		struct cache_entry *ce = istate->cache[i];
469 470 471 472 473 474 475 476 477 478 479 480 481 482
		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))
483
				ce->ce_flags |= CE_UPDATE;
484 485 486 487
		}
	}
}

488
static const char * const ls_files_usage[] = {
489
	N_("git ls-files [<options>] [<file>...]"),
490 491 492 493 494 495
	NULL
};

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

	exc_given = 1;
499
	string_list_append(exclude_list, arg);
500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524

	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;
}
525

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

592 593 594
	if (argc == 2 && !strcmp(argv[1], "-h"))
		usage_with_options(ls_files_usage, builtin_ls_files_options);

595
	memset(&dir, 0, sizeof(dir));
596
	prefix = cmd_prefix;
597
	if (prefix)
598
		prefix_len = strlen(prefix);
599
	super_prefix = get_super_prefix();
600
	git_config(git_default_config, NULL);
601

602 603 604
	if (read_cache() < 0)
		die("index file corrupt");

605
	argc = parse_options(argc, argv, prefix, builtin_ls_files_options,
606
			ls_files_usage, 0);
607 608 609 610
	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);
	}
611 612 613 614 615 616 617
	if (show_tag || show_valid_bit) {
		tag_cached = "H ";
		tag_unmerged = "M ";
		tag_removed = "R ";
		tag_modified = "C ";
		tag_other = "? ";
		tag_killed = "K ";
618
		tag_skip_worktree = "S ";
J
Junio C Hamano 已提交
619
		tag_resolve_undo = "U ";
620
	}
621
	if (show_modified || show_others || show_deleted || (dir.flags & DIR_SHOW_IGNORED) || show_killed)
622 623 624 625 626 627 628 629 630
		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;
631

632 633
	if (require_work_tree && !is_inside_work_tree())
		setup_work_tree();
634

635
	if (recurse_submodules)
636
		compile_submodule_options(argv, &dir, show_tag);
637

638 639
	if (recurse_submodules &&
	    (show_stage || show_deleted || show_others || show_unmerged ||
640
	     show_killed || show_modified || show_resolve_undo || with_tree))
641 642 643 644 645 646
		die("ls-files --recurse-submodules unsupported mode");

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

647
	parse_pathspec(&pathspec, 0,
648
		       PATHSPEC_PREFER_CWD,
649
		       prefix, argv);
650

651 652 653 654 655 656 657 658 659
	/*
	 * 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);
660 661 662
	max_prefix_len = get_common_prefix_len(max_prefix);

	prune_cache(max_prefix, max_prefix_len);
663

664
	/* Treat unmatching pathspec elements as errors */
665
	if (pathspec.nr && error_unmatch)
666
		ps_matched = xcalloc(pathspec.nr, 1);
667

668 669
	if ((dir.flags & DIR_SHOW_IGNORED) && !exc_given)
		die("ls-files --ignored needs some exclude pattern");
670 671

	/* With no flags, we default to showing the cached files */
672 673
	if (!(show_stage || show_deleted || show_others || show_unmerged ||
	      show_killed || show_modified || show_resolve_undo))
674 675
		show_cached = 1;

676 677 678 679 680 681 682
	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");
683
		overlay_tree_on_index(&the_index, with_tree, max_prefix);
684
	}
685
	show_files(&dir);
J
Junio C Hamano 已提交
686
	if (show_resolve_undo)
687
		show_ru_info();
688 689

	if (ps_matched) {
690
		int bad;
691
		bad = report_path_error(ps_matched, &pathspec, prefix);
692
		if (bad)
693 694
			fprintf(stderr, "Did you forget to 'git add'?\n");

695
		return bad ? 1 : 0;
696 697
	}

698 699
	return 0;
}