verify-pack: check integrity in a saner order.

[git.git] / ls-files.c

diff --git a/ls-files.c b/ls-files.c
index c533059..4a4af1c 100644 (file)
--- a/ls-files.c
+++ b/ls-files.c
@@ -11,6 +11,7 @@
 #include "cache.h"
 #include "quote.h"
 
+static int abbrev = 0;
 static int show_deleted = 0;
 static int show_cached = 0;
 static int show_others = 0;
@@ -20,6 +21,7 @@ static int show_unmerged = 0;
 static int show_modified = 0;
 static int show_killed = 0;
 static int show_other_directories = 0;
+static int hide_empty_directories = 0;
 static int show_valid_bit = 0;
 static int line_terminator = '\n';
 
@@ -92,11 +94,12 @@ static int add_excludes_from_file_1(const char *fname,
                close(fd);
                return 0;
        }
-       buf = xmalloc(size);
+       buf = xmalloc(size+1);
        if (read(fd, buf, size) != size)
                goto err;
        close(fd);
 
+       buf[size++] = '\n';
        entry = buf;
        for (i = 0; i < size; i++) {
                if (buf[i] == '\n') {
@@ -257,11 +260,12 @@ static int dir_exists(const char *dirname, int len)
  * Also, we ignore the name ".git" (even if it is not a directory).
  * That likely will not change.
  */
-static void read_directory(const char *path, const char *base, int baselen)
+static int read_directory(const char *path, const char *base, int baselen)
 {
-       DIR *dir = opendir(path);
+       DIR *fdir = opendir(path);
+       int contents = 0;
 
-       if (dir) {
+       if (fdir) {
                int exclude_stk;
                struct dirent *de;
                char fullname[MAXPATHLEN + 1];
@@ -269,7 +273,7 @@ static void read_directory(const char *path, const char *base, int baselen)
 
                exclude_stk = push_exclude_per_directory(base, baselen);
 
-               while ((de = readdir(dir)) != NULL) {
+               while ((de = readdir(fdir)) != NULL) {
                        int len;
 
                        if ((de->d_name[0] == '.') &&
@@ -279,11 +283,15 @@ static void read_directory(const char *path, const char *base, int baselen)
                                continue;
                        len = strlen(de->d_name);
                        memcpy(fullname + baselen, de->d_name, len+1);
-                       if (excluded(fullname) != show_ignored)
-                               continue;
+                       if (excluded(fullname) != show_ignored) {
+                               if (!show_ignored || DTYPE(de) != DT_DIR) {
+                                       continue;
+                               }
+                       }
 
                        switch (DTYPE(de)) {
                        struct stat st;
+                       int subdir, rewind_base;
                        default:
                                continue;
                        case DT_UNKNOWN:
@@ -297,22 +305,32 @@ static void read_directory(const char *path, const char *base, int baselen)
                        case DT_DIR:
                                memcpy(fullname + baselen + len, "/", 2);
                                len++;
+                               rewind_base = nr_dir;
+                               subdir = read_directory(fullname, fullname,
+                                                       baselen + len);
                                if (show_other_directories &&
-                                   !dir_exists(fullname, baselen + len))
+                                   (subdir || !hide_empty_directories) &&
+                                   !dir_exists(fullname, baselen + len)) {
+                                       // Rewind the read subdirectory
+                                       while (nr_dir > rewind_base)
+                                               free(dir[--nr_dir]);
                                        break;
-                               read_directory(fullname, fullname,
-                                              baselen + len);
+                               }
+                               contents += subdir;
                                continue;
                        case DT_REG:
                        case DT_LNK:
                                break;
                        }
                        add_name(fullname, baselen + len);
+                       contents++;
                }
-               closedir(dir);
+               closedir(fdir);
 
                pop_exclude_per_directory(exclude_stk);
        }
+
+       return contents;
 }
 
 static int cmp_name(const void *p1, const void *p2)
@@ -485,7 +503,8 @@ static void show_ce_entry(const char *tag, struct cache_entry *ce)
                printf("%s%06o %s %d\t",
                       tag,
                       ntohl(ce->ce_mode),
-                      sha1_to_hex(ce->sha1),
+                      abbrev ? find_unique_abbrev(ce->sha1,abbrev)
+                               : sha1_to_hex(ce->sha1),
                       ce_stage(ce));
                write_name_quoted("", 0, ce->name + offset,
                                  line_terminator, stdout);
@@ -626,7 +645,8 @@ static void verify_pathspec(void)
 static const char ls_files_usage[] =
        "git-ls-files [-z] [-t] [-v] (--[cached|deleted|others|stage|unmerged|killed|modified])* "
        "[ --ignored ] [--exclude=<pattern>] [--exclude-from=<file>] "
-       "[ --exclude-per-directory=<filename> ] [--full-name] [--] [<file>]*";
+       "[ --exclude-per-directory=<filename> ] [--full-name] [--abbrev] "
+       "[--] [<file>]*";
 
 int main(int argc, const char **argv)
 {
@@ -692,6 +712,10 @@ int main(int argc, const char **argv)
                        show_other_directories = 1;
                        continue;
                }
+               if (!strcmp(arg, "--no-empty-directory")) {
+                       hide_empty_directories = 1;
+                       continue;
+               }
                if (!strcmp(arg, "-u") || !strcmp(arg, "--unmerged")) {
                        /* There's no point in showing unmerged unless
                         * you also show the stage information.
@@ -733,6 +757,18 @@ int main(int argc, const char **argv)
                        error_unmatch = 1;
                        continue;
                }
+               if (!strncmp(arg, "--abbrev=", 9)) {
+                       abbrev = strtoul(arg+9, NULL, 10);
+                       if (abbrev && abbrev < MINIMUM_ABBREV)
+                               abbrev = MINIMUM_ABBREV;
+                       else if (abbrev > 40)
+                               abbrev = 40;
+                       continue;
+               }
+               if (!strcmp(arg, "--abbrev")) {
+                       abbrev = DEFAULT_ABBREV;
+                       continue;
+               }
                if (*arg == '-')
                        usage(ls_files_usage);
                break;
@@ -778,6 +814,7 @@ int main(int argc, const char **argv)
                                continue;
                        error("pathspec '%s' did not match any.",
                              pathspec[num] + prefix_offset);
+                       errors++;
                }
                return errors ? 1 : 0;
        }