summaryrefslogtreecommitdiff
path: root/read-cache.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-10-17 20:03:52 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-10-17 20:03:52 (GMT)
commite845e16ee6de99a203db47eeb840daf3b1914ec9 (patch)
tree6881244e543cbf5b17cb31a8b8512fa758a608b5 /read-cache.c
parent46dc1b0e332612aa32c139007fa33f4b429de9d1 (diff)
parent98fa473887d0bebd38d568bb07232a336a642dcf (diff)
downloadgit-e845e16ee6de99a203db47eeb840daf3b1914ec9.zip
git-e845e16ee6de99a203db47eeb840daf3b1914ec9.tar.gz
git-e845e16ee6de99a203db47eeb840daf3b1914ec9.tar.bz2
Merge branch 'jk/maint-ls-files-other' into jk/fix-ls-files-other
* jk/maint-ls-files-other: refactor handling of "other" files in ls-files and status Conflicts: read-cache.c
Diffstat (limited to 'read-cache.c')
-rw-r--r--read-cache.c27
1 files changed, 27 insertions, 0 deletions
diff --git a/read-cache.c b/read-cache.c
index c229fd4..780f2c7 100644
--- a/read-cache.c
+++ b/read-cache.c
@@ -1565,3 +1565,30 @@ int add_files_to_cache(const char *prefix, const char **pathspec, int flags)
return !!data.add_errors;
}
+/*
+ * Returns 1 if the path is an "other" path with respect to
+ * the index; that is, the path is not mentioned in the index at all,
+ * either as a file, a directory with some files in the index,
+ * or as an unmerged entry.
+ *
+ * We helpfully remove a trailing "/" from directories so that
+ * the output of read_directory can be used as-is.
+ */
+int index_name_is_other(const struct index_state *istate, const char *name,
+ int namelen)
+{
+ int pos;
+ if (namelen && name[namelen - 1] == '/')
+ namelen--;
+ pos = index_name_pos(istate, name, namelen);
+ if (0 <= pos)
+ return 0; /* exact match */
+ pos = -pos - 1;
+ if (pos < istate->cache_nr) {
+ struct cache_entry *ce = istate->cache[pos];
+ if (ce_namelen(ce) == namelen &&
+ !memcmp(ce->name, name, namelen))
+ return 0; /* Yup, this one exists unmerged */
+ }
+ return 1;
+}