runstatus: do not recurse into subdirectories if not needed
This speeds up the case when you run git-status, having an untracked subdirectory containing huge amounts of files. Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
Johannes Schindelin committed
Sep 28, 2006 at 02:44 UTC
07ccbff89b6736a5253e6bba62c9a8e1f2da0ffd
1 file changed
+15
-12
dir.c
+15
-12
@@ -283,7 +283,7 @@ static int dir_exists(const char *dirname, int len)
283
* Also, we ignore the name ".git" (even if it is not a directory).
284
* That likely will not change.
285
*/
286
-static int read_directory_recursive(struct dir_struct *dir, const char *path, const char *base, int baselen)
286
+static int read_directory_recursive(struct dir_struct *dir, const char *path, const char *base, int baselen, int check_only)
287
{
288
DIR *fdir = opendir(path);
289
int contents = 0;
@@ -314,7 +314,6 @@ static int read_directory_recursive(struct dir_struct *dir, const char *path, co
314
315
switch (DTYPE(de)) {
316
struct stat st;
317
- int subdir, rewind_base;
317
default:
318
continue;
319
case DT_UNKNOWN:
@@ -328,26 +327,30 @@ static int read_directory_recursive(struct dir_struct *dir, const char *path, co
327
case DT_DIR:
328
memcpy(fullname + baselen + len, "/", 2);
329
len++;
331
- rewind_base = dir->nr;
332
- subdir = read_directory_recursive(dir, fullname, fullname,
333
- baselen + len);
330
if (dir->show_other_directories &&
335
- (subdir || !dir->hide_empty_directories) &&
331
!dir_exists(fullname, baselen + len)) {
337
- /* Rewind the read subdirectory */
338
- while (dir->nr > rewind_base)
339
- free(dir->entries[--dir->nr]);
332
+ if (dir->hide_empty_directories &&
333
+ !read_directory_recursive(dir,
334
+ fullname, fullname,
335
+ baselen + len, 1))
336
+ continue;
337
break;
338
}
342
- contents += subdir;
339
+
340
+ contents += read_directory_recursive(dir,
341
+ fullname, fullname, baselen + len, 0);
342
continue;
343
case DT_REG:
344
case DT_LNK:
345
break;
346
}
348
- add_name(dir, fullname, baselen + len);
347
contents++;
348
+ if (check_only)
349
+ goto exit_early;
350
+ else
351
+ add_name(dir, fullname, baselen + len);
352
}
353
+exit_early:
354
closedir(fdir);
355
356
pop_exclude_per_directory(dir, exclude_stk);
@@ -393,7 +396,7 @@ int read_directory(struct dir_struct *dir, const char *path, const char *base, i
396
}
397
}
398
396
- read_directory_recursive(dir, path, base, baselen);
399
+ read_directory_recursive(dir, path, base, baselen, 0);
400
qsort(dir->entries, dir->nr, sizeof(struct dir_entry *), cmp_name);
401
return dir->nr;
402
}