diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-11-02 13:37:13 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-11-02 13:37:13 -0800 |
| commit | 86e67a088c581da4da36acf0edd8c27b1033e51e (patch) | |
| tree | ff6c53429e67c4f44f7c7b07cfa8bcb980c7570a /cache.h | |
| parent | d11ddaff021be8006e71b43a5205c48f2dac7f18 (diff) | |
| parent | 98fa473887d0bebd38d568bb07232a336a642dcf (diff) | |
| download | git-86e67a088c581da4da36acf0edd8c27b1033e51e.tar.gz git-86e67a088c581da4da36acf0edd8c27b1033e51e.tar.xz | |
Merge branch 'jk/maint-ls-files-other' into maint
* jk/maint-ls-files-other:
refactor handling of "other" files in ls-files and status
Diffstat (limited to 'cache.h')
| -rw-r--r-- | cache.h | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -270,6 +270,7 @@ static inline void remove_name_hash(struct cache_entry *ce) #define ce_match_stat(ce, st, options) ie_match_stat(&the_index, (ce), (st), (options)) #define ce_modified(ce, st, options) ie_modified(&the_index, (ce), (st), (options)) #define cache_name_exists(name, namelen, igncase) index_name_exists(&the_index, (name), (namelen), (igncase)) +#define cache_name_is_other(name, namelen) index_name_is_other(&the_index, (name), (namelen)) #endif enum object_type { @@ -382,6 +383,7 @@ extern int add_to_index(struct index_state *, const char *path, struct stat *, i extern int add_file_to_index(struct index_state *, const char *path, int flags); extern struct cache_entry *make_cache_entry(unsigned int mode, const unsigned char *sha1, const char *path, int stage, int refresh); extern int ce_same_name(struct cache_entry *a, struct cache_entry *b); +extern int index_name_is_other(const struct index_state *, const char *, int); /* do stat comparison even if CE_VALID is true */ #define CE_MATCH_IGNORE_VALID 01 |