aboutsummaryrefslogtreecommitdiff
path: root/cache.h
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-05-20 01:28:49 -0700
committerJunio C Hamano <junkio@cox.net>2006-05-20 01:52:19 -0700
commit93872e07008510340eec951f0d037f7b3a0b8567 (patch)
treece5b2c6456000dd5e8dde7b479c2ad6784966055 /cache.h
parent283c8eef6c9a4e379c73904d2bc22b19341b15c8 (diff)
parentd9b814cc97f16daac06566a5340121c446136d22 (diff)
downloadgit-93872e07008510340eec951f0d037f7b3a0b8567.tar.gz
git-93872e07008510340eec951f0d037f7b3a0b8567.tar.xz
Merge branch 'lt/dirwalk' into jc/dirwalk-n-cache-tree
This commit is what this branch is all about. It records the evil merge needed to adjust built-in git-add and git-rm for the cache-tree extension. * lt/dirwalk: Add builtin "git rm" command Move pathspec matching from builtin-add.c into dir.c Prevent bogus paths from being added to the index. builtin-add: fix unmatched pathspec warnings. Remove old "git-add.sh" remnants builtin-add: warn on unmatched pathspecs Do "git add" as a builtin Clean up git-ls-file directory walking library interface libify git-ls-files directory traversal Conflicts: Makefile builtin.h git.c update-index.c
Diffstat (limited to 'cache.h')
-rw-r--r--cache.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/cache.h b/cache.h
index c71c61aac..18d129f5b 100644
--- a/cache.h
+++ b/cache.h
@@ -143,6 +143,7 @@ extern void verify_non_filename(const char *prefix, const char *name);
/* Initialize and use the cache information */
extern int read_cache(void);
extern int write_cache(int newfd, struct cache_entry **cache, int entries);
+extern int verify_path(const char *path);
extern int cache_name_pos(const char *name, int namelen);
#define ADD_CACHE_OK_TO_ADD 1 /* Ok to add */
#define ADD_CACHE_OK_TO_REPLACE 2 /* Ok to replace file/directory */