git-diff: do not fall back on --cc when -[123], --ours etc. are given.

diff --git a/ls-files.c b/ls-files.c
index 841c98a710d6fbe58f21e8ab2e9b613fb592d7f3..6af3b091b049d8ded1999405b4da7191f2b36a4c 100644 (file)
--- a/ls-files.c
+++ b/ls-files.c
@@ -209,7 +209,7 @@ static int excluded(const char *pathname)
 
 struct nond_on_fs {
        int len;
-       char name[0];
+       char name[FLEX_ARRAY]; /* more */
 };
 
 static struct nond_on_fs **dir;
@@ -240,11 +240,9 @@ static int dir_exists(const char *dirname, int len)
        if (pos >= 0)
                return 1;
        pos = -pos-1;
-       if (pos >= active_nr)
+       if (pos >= active_nr) /* can't */
                return 0;
-       if (strncmp(active_cache[pos]->name, dirname, len))
-               return 0;
-       return active_cache[pos]->name[len] == '/';
+       return !strncmp(active_cache[pos]->name, dirname, len);
 }
 
 /*
@@ -294,13 +292,13 @@ static void read_directory(const char *path, const char *base, int baselen)
                                        continue;
                                /* fallthrough */
                        case DT_DIR:
-                               if (show_other_directories) {
-                                       if (!dir_exists(fullname, baselen + len))
-                                               break;
-                               }
                                memcpy(fullname + baselen + len, "/", 2);
+                               len++;
+                               if (show_other_directories &&
+                                   !dir_exists(fullname, baselen + len))
+                                       break;
                                read_directory(fullname, fullname,
-                                              baselen + len + 1);
+                                              baselen + len);
                                continue;
                        case DT_REG:
                        case DT_LNK: