diff --git a/builtin-ls-files.c b/builtin-ls-files.c
index f7c066b24b7a6a728fd2f0bf4a92a31fb4a695dd..61577ea13ffdf0143dcb8a13c37ae49c1f8f2018 100644 (file)
--- a/builtin-ls-files.c
+++ b/builtin-ls-files.c
if (0 <= pos)
continue; /* exact match */
pos = -pos - 1;
if (0 <= pos)
continue; /* exact match */
pos = -pos - 1;
- if (pos < active_nr) {
+ if (pos < active_nr) {
ce = active_cache[pos];
if (ce_namelen(ce) == len &&
!memcmp(ce->name, ent->name, len))
ce = active_cache[pos];
if (ce_namelen(ce) == len &&
!memcmp(ce->name, ent->name, len))
}
if (require_work_tree &&
}
if (require_work_tree &&
- (is_bare_repository() || is_inside_git_dir()))
+ (!is_inside_work_tree() || is_inside_git_dir()))
die("This operation must be run in a work tree");
pathspec = get_pathspec(prefix, argv + i);
die("This operation must be run in a work tree");
pathspec = get_pathspec(prefix, argv + i);