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.
6 * Copyright (C) Linus Torvalds, 2005
13 #include "parse-options.h"
16 static int show_deleted
;
17 static int show_cached
;
18 static int show_others
;
19 static int show_stage
;
20 static int show_unmerged
;
21 static int show_modified
;
22 static int show_killed
;
23 static int show_valid_bit
;
24 static int line_terminator
= '\n';
26 static int prefix_len
;
27 static int prefix_offset
;
28 static const char **pathspec
;
29 static int error_unmatch
;
30 static char *ps_matched
;
31 static const char *with_tree
;
34 static const char *tag_cached
= "";
35 static const char *tag_unmerged
= "";
36 static const char *tag_removed
= "";
37 static const char *tag_other
= "";
38 static const char *tag_killed
= "";
39 static const char *tag_modified
= "";
41 static void show_dir_entry(const char *tag
, struct dir_entry
*ent
)
44 int offset
= prefix_offset
;
47 die("git ls-files: internal error - directory entry not superset of prefix");
49 if (!match_pathspec(pathspec
, ent
->name
, ent
->len
, len
, ps_matched
))
53 write_name_quoted(ent
->name
+ offset
, stdout
, line_terminator
);
56 static void show_other_files(struct dir_struct
*dir
)
60 for (i
= 0; i
< dir
->nr
; i
++) {
61 struct dir_entry
*ent
= dir
->entries
[i
];
62 if (!cache_name_is_other(ent
->name
, ent
->len
))
64 show_dir_entry(tag_other
, ent
);
68 static void show_killed_files(struct dir_struct
*dir
)
71 for (i
= 0; i
< dir
->nr
; i
++) {
72 struct dir_entry
*ent
= dir
->entries
[i
];
74 int pos
, len
, killed
= 0;
76 for (cp
= ent
->name
; cp
- ent
->name
< ent
->len
; cp
= sp
+ 1) {
79 /* If ent->name is prefix of an entry in the
80 * cache, it will be killed.
82 pos
= cache_name_pos(ent
->name
, ent
->len
);
84 die("bug in show-killed-files");
86 while (pos
< active_nr
&&
87 ce_stage(active_cache
[pos
]))
88 pos
++; /* skip unmerged */
91 /* pos points at a name immediately after
92 * ent->name in the cache. Does it expect
93 * ent->name to be a directory?
95 len
= ce_namelen(active_cache
[pos
]);
96 if ((ent
->len
< len
) &&
97 !strncmp(active_cache
[pos
]->name
,
98 ent
->name
, ent
->len
) &&
99 active_cache
[pos
]->name
[ent
->len
] == '/')
103 if (0 <= cache_name_pos(ent
->name
, sp
- ent
->name
)) {
104 /* If any of the leading directories in
105 * ent->name is registered in the cache,
106 * ent->name will be killed.
113 show_dir_entry(tag_killed
, dir
->entries
[i
]);
117 static void show_ce_entry(const char *tag
, struct cache_entry
*ce
)
119 int len
= prefix_len
;
120 int offset
= prefix_offset
;
122 if (len
>= ce_namelen(ce
))
123 die("git ls-files: internal error - cache entry not superset of prefix");
125 if (!match_pathspec(pathspec
, ce
->name
, ce_namelen(ce
), len
, ps_matched
))
128 if (tag
&& *tag
&& show_valid_bit
&&
129 (ce
->ce_flags
& CE_VALID
)) {
130 static char alttag
[4];
131 memcpy(alttag
, tag
, 3);
133 alttag
[0] = tolower(tag
[0]);
134 else if (tag
[0] == '?')
148 printf("%s%06o %s %d\t",
151 abbrev
? find_unique_abbrev(ce
->sha1
,abbrev
)
152 : sha1_to_hex(ce
->sha1
),
155 write_name_quoted(ce
->name
+ offset
, stdout
, line_terminator
);
158 static void show_files(struct dir_struct
*dir
, const char *prefix
)
162 /* For cached/deleted files we don't need to even do the readdir */
163 if (show_others
|| show_killed
) {
164 fill_directory(dir
, pathspec
);
166 show_other_files(dir
);
168 show_killed_files(dir
);
170 if (show_cached
| show_stage
) {
171 for (i
= 0; i
< active_nr
; i
++) {
172 struct cache_entry
*ce
= active_cache
[i
];
173 int dtype
= ce_to_dtype(ce
);
174 if (excluded(dir
, ce
->name
, &dtype
) !=
175 !!(dir
->flags
& DIR_SHOW_IGNORED
))
177 if (show_unmerged
&& !ce_stage(ce
))
179 if (ce
->ce_flags
& CE_UPDATE
)
181 show_ce_entry(ce_stage(ce
) ? tag_unmerged
: tag_cached
, ce
);
184 if (show_deleted
| show_modified
) {
185 for (i
= 0; i
< active_nr
; i
++) {
186 struct cache_entry
*ce
= active_cache
[i
];
189 int dtype
= ce_to_dtype(ce
);
190 if (excluded(dir
, ce
->name
, &dtype
) !=
191 !!(dir
->flags
& DIR_SHOW_IGNORED
))
193 if (ce
->ce_flags
& CE_UPDATE
)
195 err
= lstat(ce
->name
, &st
);
196 if (show_deleted
&& err
)
197 show_ce_entry(tag_removed
, ce
);
198 if (show_modified
&& ce_modified(ce
, &st
, 0))
199 show_ce_entry(tag_modified
, ce
);
205 * Prune the index to only contain stuff starting with "prefix"
207 static void prune_cache(const char *prefix
)
209 int pos
= cache_name_pos(prefix
, prefix_len
);
210 unsigned int first
, last
;
214 memmove(active_cache
, active_cache
+ pos
,
215 (active_nr
- pos
) * sizeof(struct cache_entry
*));
219 while (last
> first
) {
220 int next
= (last
+ first
) >> 1;
221 struct cache_entry
*ce
= active_cache
[next
];
222 if (!strncmp(ce
->name
, prefix
, prefix_len
)) {
231 static const char *verify_pathspec(const char *prefix
)
233 const char **p
, *n
, *prev
;
238 for (p
= pathspec
; (n
= *p
) != NULL
; p
++) {
240 for (i
= 0; i
< max
; i
++) {
242 if (prev
&& prev
[i
] != c
)
244 if (!c
|| c
== '*' || c
== '?')
257 if (prefix_offset
> max
|| memcmp(prev
, prefix
, prefix_offset
))
258 die("git ls-files: cannot generate relative filenames containing '..'");
261 return max
? xmemdupz(prev
, max
) : NULL
;
264 static void strip_trailing_slash_from_submodules(void)
268 for (p
= pathspec
; *p
!= NULL
; p
++) {
269 int len
= strlen(*p
), pos
;
271 if (len
< 1 || (*p
)[len
- 1] != '/')
273 pos
= cache_name_pos(*p
, len
- 1);
274 if (pos
>= 0 && S_ISGITLINK(active_cache
[pos
]->ce_mode
))
275 *p
= xstrndup(*p
, len
- 1);
280 * Read the tree specified with --with-tree option
281 * (typically, HEAD) into stage #1 and then
282 * squash them down to stage #0. This is used for
283 * --error-unmatch to list and check the path patterns
284 * that were given from the command line. We are not
285 * going to write this index out.
287 void overlay_tree_on_cache(const char *tree_name
, const char *prefix
)
290 unsigned char sha1
[20];
292 struct cache_entry
*last_stage0
= NULL
;
295 if (get_sha1(tree_name
, sha1
))
296 die("tree-ish %s not found.", tree_name
);
297 tree
= parse_tree_indirect(sha1
);
299 die("bad tree-ish %s", tree_name
);
301 /* Hoist the unmerged entries up to stage #3 to make room */
302 for (i
= 0; i
< active_nr
; i
++) {
303 struct cache_entry
*ce
= active_cache
[i
];
306 ce
->ce_flags
|= CE_STAGEMASK
;
310 static const char *(matchbuf
[2]);
311 matchbuf
[0] = prefix
;
316 if (read_tree(tree
, 1, match
))
317 die("unable to read tree entries %s", tree_name
);
319 for (i
= 0; i
< active_nr
; i
++) {
320 struct cache_entry
*ce
= active_cache
[i
];
321 switch (ce_stage(ce
)) {
329 * If there is stage #0 entry for this, we do not
330 * need to show it. We use CE_UPDATE bit to mark
334 !strcmp(last_stage0
->name
, ce
->name
))
335 ce
->ce_flags
|= CE_UPDATE
;
340 int report_path_error(const char *ps_matched
, const char **pathspec
, int prefix_offset
)
343 * Make sure all pathspec matched; otherwise it is an error.
346 for (num
= 0; pathspec
[num
]; num
++) {
347 int other
, found_dup
;
352 * The caller might have fed identical pathspec
353 * twice. Do not barf on such a mistake.
355 for (found_dup
= other
= 0;
356 !found_dup
&& pathspec
[other
];
358 if (other
== num
|| !ps_matched
[other
])
360 if (!strcmp(pathspec
[other
], pathspec
[num
]))
362 * Ok, we have a match already.
369 error("pathspec '%s' did not match any file(s) known to git.",
370 pathspec
[num
] + prefix_offset
);
376 static const char * const ls_files_usage
[] = {
377 "git ls-files [options] [<file>]*",
381 static int option_parse_z(const struct option
*opt
,
382 const char *arg
, int unset
)
384 line_terminator
= unset
? '\n' : '\0';
389 static int option_parse_exclude(const struct option
*opt
,
390 const char *arg
, int unset
)
392 struct exclude_list
*list
= opt
->value
;
395 add_exclude(arg
, "", 0, list
);
400 static int option_parse_exclude_from(const struct option
*opt
,
401 const char *arg
, int unset
)
403 struct dir_struct
*dir
= opt
->value
;
406 add_excludes_from_file(dir
, arg
);
411 static int option_parse_exclude_standard(const struct option
*opt
,
412 const char *arg
, int unset
)
414 struct dir_struct
*dir
= opt
->value
;
417 setup_standard_excludes(dir
);
422 int cmd_ls_files(int argc
, const char **argv
, const char *prefix
)
424 int require_work_tree
= 0, show_tag
= 0;
425 struct dir_struct dir
;
426 struct option builtin_ls_files_options
[] = {
427 { OPTION_CALLBACK
, 'z', NULL
, NULL
, NULL
,
428 "paths are separated with NUL character",
429 PARSE_OPT_NOARG
, option_parse_z
},
430 OPT_BOOLEAN('t', NULL
, &show_tag
,
431 "identify the file status with tags"),
432 OPT_BOOLEAN('v', NULL
, &show_valid_bit
,
433 "use lowercase letters for 'assume unchanged' files"),
434 OPT_BOOLEAN('c', "cached", &show_cached
,
435 "show cached files in the output (default)"),
436 OPT_BOOLEAN('d', "deleted", &show_deleted
,
437 "show deleted files in the output"),
438 OPT_BOOLEAN('m', "modified", &show_modified
,
439 "show modified files in the output"),
440 OPT_BOOLEAN('o', "others", &show_others
,
441 "show other files in the output"),
442 OPT_BIT('i', "ignored", &dir
.flags
,
443 "show ignored files in the output",
445 OPT_BOOLEAN('s', "stage", &show_stage
,
446 "show staged contents' object name in the output"),
447 OPT_BOOLEAN('k', "killed", &show_killed
,
448 "show files on the filesystem that need to be removed"),
449 OPT_BIT(0, "directory", &dir
.flags
,
450 "show 'other' directories' name only",
451 DIR_SHOW_OTHER_DIRECTORIES
),
452 OPT_NEGBIT(0, "empty-directory", &dir
.flags
,
453 "don't show empty directories",
454 DIR_HIDE_EMPTY_DIRECTORIES
),
455 OPT_BOOLEAN('u', "unmerged", &show_unmerged
,
456 "show unmerged files in the output"),
457 { OPTION_CALLBACK
, 'x', "exclude", &dir
.exclude_list
[EXC_CMDL
], "pattern",
458 "skip files matching pattern",
459 0, option_parse_exclude
},
460 { OPTION_CALLBACK
, 'X', "exclude-from", &dir
, "file",
461 "exclude patterns are read from <file>",
462 0, option_parse_exclude_from
},
463 OPT_STRING(0, "exclude-per-directory", &dir
.exclude_per_dir
, "file",
464 "read additional per-directory exclude patterns in <file>"),
465 { OPTION_CALLBACK
, 0, "exclude-standard", &dir
, NULL
,
466 "add the standard git exclusions",
467 PARSE_OPT_NOARG
, option_parse_exclude_standard
},
468 { OPTION_SET_INT
, 0, "full-name", &prefix_offset
, NULL
,
469 "make the output relative to the project top directory",
470 PARSE_OPT_NOARG
| PARSE_OPT_NONEG
, NULL
},
471 OPT_BOOLEAN(0, "error-unmatch", &error_unmatch
,
472 "if any <file> is not in the index, treat this as an error"),
473 OPT_STRING(0, "with-tree", &with_tree
, "tree-ish",
474 "pretend that paths removed since <tree-ish> are still present"),
475 OPT__ABBREV(&abbrev
),
479 memset(&dir
, 0, sizeof(dir
));
481 prefix_offset
= strlen(prefix
);
482 git_config(git_default_config
, NULL
);
484 argc
= parse_options(argc
, argv
, prefix
, builtin_ls_files_options
,
486 if (show_tag
|| show_valid_bit
) {
494 if (show_modified
|| show_others
|| show_deleted
|| (dir
.flags
& DIR_SHOW_IGNORED
) || show_killed
)
495 require_work_tree
= 1;
498 * There's no point in showing unmerged unless
499 * you also show the stage information.
502 if (dir
.exclude_per_dir
)
505 if (require_work_tree
&& !is_inside_work_tree())
508 pathspec
= get_pathspec(prefix
, argv
);
510 /* be nice with submodule paths ending in a slash */
513 strip_trailing_slash_from_submodules();
515 /* Verify that the pathspec matches the prefix */
517 prefix
= verify_pathspec(prefix
);
519 /* Treat unmatching pathspec elements as errors */
520 if (pathspec
&& error_unmatch
) {
522 for (num
= 0; pathspec
[num
]; num
++)
524 ps_matched
= xcalloc(1, num
);
527 if ((dir
.flags
& DIR_SHOW_IGNORED
) && !exc_given
)
528 die("ls-files --ignored needs some exclude pattern");
530 /* With no flags, we default to showing the cached files */
531 if (!(show_stage
| show_deleted
| show_others
| show_unmerged
|
532 show_killed
| show_modified
))
539 * Basic sanity check; show-stages and show-unmerged
540 * would not make any sense with this option.
542 if (show_stage
|| show_unmerged
)
543 die("ls-files --with-tree is incompatible with -s or -u");
544 overlay_tree_on_cache(with_tree
, prefix
);
546 show_files(&dir
, prefix
);
550 bad
= report_path_error(ps_matched
, pathspec
, prefix_offset
);
552 fprintf(stderr
, "Did you forget to 'git add'?\n");