@matheusbsbs / matheus-bagliano / commits / 9518eb2629
Fork 0

ls-files -o: optionally skip showing the contents in "untracked" directories

Darrin Thompson notes that git-ls-files -o reports all the unknown files it finds in a work area. Subversion and probably other systems "simply ignore all the files and directories inside an unknown directory and just note the directory as unknown." With --directory option, ls-files --others shows untracked directories without descending into them. Signed-off-by: Junio C Hamano <junkio@cox.net>

Linus Torvalds committed Jan 4, 2006 at 13:31 UTC 9518eb262980d5048ef71e4450ef2cf78d7df6b5
1 file changed +22
ls-files.c
+22
@@ -19,6 +19,7 @@ static int show_stage = 0;
19 static int show_unmerged = 0;
20 static int show_modified = 0;
21 static int show_killed = 0;
22 +static int show_other_directories = 0;
23 static int line_terminator = '\n';
24
25 static int prefix_len = 0, prefix_offset = 0;
@@ -233,6 +234,19 @@ static void add_name(const char *pathname, int len)
234 dir[nr_dir++] = ent;
235 }
236
237 +static int dir_exists(const char *dirname, int len)
238 +{
239 + int pos = cache_name_pos(dirname, len);
240 + if (pos >= 0)
241 + return 1;
242 + pos = -pos-1;
243 + if (pos >= active_nr)
244 + return 0;
245 + if (strncmp(active_cache[pos]->name, dirname, len))
246 + return 0;
247 + return active_cache[pos]->name[len] == '/';
248 +}
249 +
250 /*
251 * Read a directory tree. We currently ignore anything but
252 * directories, regular files and symlinks. That's because git
@@ -280,6 +294,10 @@ static void read_directory(const char *path, const char *base, int baselen)
294 continue;
295 /* fallthrough */
296 case DT_DIR:
297 + if (show_other_directories) {
298 + if (!dir_exists(fullname, baselen + len))
299 + break;
300 + }
301 memcpy(fullname + baselen + len, "/", 2);
302 read_directory(fullname, fullname,
303 baselen + len + 1);
@@ -622,6 +640,10 @@ int main(int argc, const char **argv)
640 show_killed = 1;
641 continue;
642 }
643 + if (!strcmp(arg, "--directory")) {
644 + show_other_directories = 1;
645 + continue;
646 + }
647 if (!strcmp(arg, "-u") || !strcmp(arg, "--unmerged")) {
648 /* There's no point in showing unmerged unless
649 * you also show the stage information.