X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=ls-files.c;h=db2288aeee61bf64f30fdcc4b11e91c0cd3038a0;hb=10bea152a34b2bf1194ede5e0c9e5595ab2100f3;hp=d9c8b215f1dcc48ebd7de9f92713f43a09a80e66;hpb=d317e4384acd5646f2ba44197a531c129b26b57e;p=git.git diff --git a/ls-files.c b/ls-files.c index d9c8b215..db2288ae 100644 --- a/ls-files.c +++ b/ls-files.c @@ -348,6 +348,29 @@ static void show_dir_entry(const char *tag, struct nond_on_fs *ent) putchar(line_terminator); } +static void show_other_files(void) +{ + int i; + for (i = 0; i < nr_dir; i++) { + /* We should not have a matching entry, but we + * may have an unmerged entry for this path. + */ + struct nond_on_fs *ent = dir[i]; + int pos = cache_name_pos(ent->name, ent->len); + struct cache_entry *ce; + if (0 <= pos) + die("bug in show-other-files"); + pos = -pos - 1; + if (pos < active_nr) { + ce = active_cache[pos]; + if (ce_namelen(ce) == ent->len && + !memcmp(ce->name, ent->name, ent->len)) + continue; /* Yup, this one exists unmerged */ + } + show_dir_entry(tag_other, ent); + } +} + static void show_killed_files(void) { int i; @@ -438,8 +461,7 @@ static void show_files(void) read_directory(path, base, baselen); qsort(dir, nr_dir, sizeof(struct nond_on_fs *), cmp_name); if (show_others) - for (i = 0; i < nr_dir; i++) - show_dir_entry(tag_other, dir[i]); + show_other_files(); if (show_killed) show_killed_files(); } @@ -548,6 +570,7 @@ int main(int argc, const char **argv) prefix = setup_git_directory(); if (prefix) prefix_offset = strlen(prefix); + git_config(git_default_config); for (i = 1; i < argc; i++) { const char *arg = argv[i];