Merge branch 'jc/diffcore-rotate'

[thirdparty/git.git] / builtin / ls-files.c

diff --git a/builtin/ls-files.c b/builtin/ls-files.c
index c8eae899b82a83ebc3487ffa99ba2bcf73d3369f..f6f9e483b27e183e29e9c409669c6b23d5590cfc 100644 (file)
--- a/builtin/ls-files.c
+++ b/builtin/ls-files.c
@@ -35,6 +35,7 @@ static int line_terminator = '\n';
 static int debug_mode;
 static int show_eol;
 static int recurse_submodules;
+static int skipping_duplicates;
 
 static const char *prefix;
 static int max_prefix_len;
@@ -312,45 +313,59 @@ static void show_files(struct repository *repo, struct dir_struct *dir)
                if (show_killed)
                        show_killed_files(repo->index, dir);
        }
-       if (show_cached || show_stage) {
-               for (i = 0; i < repo->index->cache_nr; i++) {
-                       const struct cache_entry *ce = repo->index->cache[i];
 
-                       construct_fullname(&fullname, repo, ce);
+       if (!(show_cached || show_stage || show_deleted || show_modified))
+               return;
+       for (i = 0; i < repo->index->cache_nr; i++) {
+               const struct cache_entry *ce = repo->index->cache[i];
+               struct stat st;
+               int stat_err;
 
-                       if ((dir->flags & DIR_SHOW_IGNORED) &&
-                           !ce_excluded(dir, repo->index, fullname.buf, ce))
-                               continue;
-                       if (show_unmerged && !ce_stage(ce))
-                               continue;
-                       if (ce->ce_flags & CE_UPDATE)
-                               continue;
+               construct_fullname(&fullname, repo, ce);
+
+               if ((dir->flags & DIR_SHOW_IGNORED) &&
+                       !ce_excluded(dir, repo->index, fullname.buf, ce))
+                       continue;
+               if (ce->ce_flags & CE_UPDATE)
+                       continue;
+               if ((show_cached || show_stage) &&
+                   (!show_unmerged || ce_stage(ce))) {
                        show_ce(repo, dir, ce, fullname.buf,
                                ce_stage(ce) ? tag_unmerged :
                                (ce_skip_worktree(ce) ? tag_skip_worktree :
                                 tag_cached));
+                       if (skipping_duplicates)
+                               goto skip_to_next_name;
                }
-       }
-       if (show_deleted || show_modified) {
-               for (i = 0; i < repo->index->cache_nr; i++) {
-                       const struct cache_entry *ce = repo->index->cache[i];
-                       struct stat st;
-                       int err;
 
-                       construct_fullname(&fullname, repo, ce);
-
-                       if ((dir->flags & DIR_SHOW_IGNORED) &&
-                           !ce_excluded(dir, repo->index, fullname.buf, ce))
-                               continue;
-                       if (ce->ce_flags & CE_UPDATE)
-                               continue;
-                       if (ce_skip_worktree(ce))
-                               continue;
-                       err = lstat(fullname.buf, &st);
-                       if (show_deleted && err)
-                               show_ce(repo, dir, ce, fullname.buf, tag_removed);
-                       if (show_modified && ie_modified(repo->index, ce, &st, 0))
-                               show_ce(repo, dir, ce, fullname.buf, tag_modified);
+               if (!(show_deleted || show_modified))
+                       continue;
+               if (ce_skip_worktree(ce))
+                       continue;
+               stat_err = lstat(fullname.buf, &st);
+               if (stat_err && (errno != ENOENT && errno != ENOTDIR))
+                       error_errno("cannot lstat '%s'", fullname.buf);
+               if (stat_err && show_deleted) {
+                       show_ce(repo, dir, ce, fullname.buf, tag_removed);
+                       if (skipping_duplicates)
+                               goto skip_to_next_name;
+               }
+               if (show_modified &&
+                   (stat_err || ie_modified(repo->index, ce, &st, 0))) {
+                       show_ce(repo, dir, ce, fullname.buf, tag_modified);
+                       if (skipping_duplicates)
+                               goto skip_to_next_name;
+               }
+               continue;
+
+skip_to_next_name:
+               {
+                       int j;
+                       struct cache_entry **cache = repo->index->cache;
+                       for (j = i + 1; j < repo->index->cache_nr; j++)
+                               if (strcmp(ce->name, cache[j]->name))
+                                       break;
+                       i = j - 1; /* compensate for the for loop */
                }
        }
 
@@ -578,6 +593,8 @@ int cmd_ls_files(int argc, const char **argv, const char *cmd_prefix)
                        N_("pretend that paths removed since <tree-ish> are still present")),
                OPT__ABBREV(&abbrev),
                OPT_BOOL(0, "debug", &debug_mode, N_("show debugging data")),
+               OPT_BOOL(0, "deduplicate", &skipping_duplicates,
+                        N_("suppress duplicate entries")),
                OPT_END()
        };
 
@@ -617,6 +634,8 @@ int cmd_ls_files(int argc, const char **argv, const char *cmd_prefix)
                 * you also show the stage information.
                 */
                show_stage = 1;
+       if (show_tag || show_stage)
+               skipping_duplicates = 0;
        if (dir.exclude_per_dir)
                exc_given = 1;