author | Lars Hjemli <hjemli@gmail.com> | 2009-08-11 08:08:12 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2009-08-24 08:22:57 (UTC) |
commit | fb9bf55cde24bbb46568575fc65739a9226f8216 (patch) (unidiff) | |
tree | 12380177c2b33f8acd2553769744dc87b062d0e4 /scan-tree.c | |
parent | b44c40ea720aee9ba4412e192877e9632a70a259 (diff) | |
download | cgit-fb9bf55cde24bbb46568575fc65739a9226f8216.zip cgit-fb9bf55cde24bbb46568575fc65739a9226f8216.tar.gz cgit-fb9bf55cde24bbb46568575fc65739a9226f8216.tar.bz2 |
scan-tree: detect non-bare repository and stop scanning early
We don't want to descend into every subdirectory of a git repository
with a workdir.
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | scan-tree.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/scan-tree.c b/scan-tree.c index 4da21a4..67f4550 100644 --- a/scan-tree.c +++ b/scan-tree.c | |||
@@ -76,32 +76,36 @@ static void add_repo(const char *base, const char *path) | |||
76 | p = fmt("%s/README.html", path); | 76 | p = fmt("%s/README.html", path); |
77 | if (!stat(p, &st)) | 77 | if (!stat(p, &st)) |
78 | repo->readme = "README.html"; | 78 | repo->readme = "README.html"; |
79 | } | 79 | } |
80 | 80 | ||
81 | static void scan_path(const char *base, const char *path) | 81 | static void scan_path(const char *base, const char *path) |
82 | { | 82 | { |
83 | DIR *dir; | 83 | DIR *dir; |
84 | struct dirent *ent; | 84 | struct dirent *ent; |
85 | char *buf; | 85 | char *buf; |
86 | struct stat st; | 86 | struct stat st; |
87 | 87 | ||
88 | if (is_git_dir(path)) { | 88 | if (is_git_dir(path)) { |
89 | add_repo(base, path); | 89 | add_repo(base, path); |
90 | return; | 90 | return; |
91 | } | 91 | } |
92 | if (is_git_dir(fmt("%s/.git", path))) { | ||
93 | add_repo(base, fmt("%s/.git", path)); | ||
94 | return; | ||
95 | } | ||
92 | dir = opendir(path); | 96 | dir = opendir(path); |
93 | if (!dir) { | 97 | if (!dir) { |
94 | fprintf(stderr, "Error opening directory %s: %s (%d)\n", | 98 | fprintf(stderr, "Error opening directory %s: %s (%d)\n", |
95 | path, strerror(errno), errno); | 99 | path, strerror(errno), errno); |
96 | return; | 100 | return; |
97 | } | 101 | } |
98 | while((ent = readdir(dir)) != NULL) { | 102 | while((ent = readdir(dir)) != NULL) { |
99 | if (ent->d_name[0] == '.') { | 103 | if (ent->d_name[0] == '.') { |
100 | if (ent->d_name[1] == '\0') | 104 | if (ent->d_name[1] == '\0') |
101 | continue; | 105 | continue; |
102 | if (ent->d_name[1] == '.' && ent->d_name[2] == '\0') | 106 | if (ent->d_name[1] == '.' && ent->d_name[2] == '\0') |
103 | continue; | 107 | continue; |
104 | } | 108 | } |
105 | buf = malloc(strlen(path) + strlen(ent->d_name) + 2); | 109 | buf = malloc(strlen(path) + strlen(ent->d_name) + 2); |
106 | if (!buf) { | 110 | if (!buf) { |
107 | fprintf(stderr, "Alloc error on %s: %s (%d)\n", | 111 | fprintf(stderr, "Alloc error on %s: %s (%d)\n", |