summaryrefslogtreecommitdiff
path: root/cache.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-09-16 14:26:40 -0700
committerJunio C Hamano <gitster@pobox.com>2009-09-16 14:26:40 -0700
commitbba287531b3a845faa032a8fef3e6d70d185c89b (patch)
treee234c232ce0b8acef3f43fa34c036e68522b5612 /cache.h
parent4197ce3c6d943759e1088a0298b64571b4bc725a (diff)
parentda02ca508b842e61c71d920310ff30bbe0238993 (diff)
downloadgit-bba287531b3a845faa032a8fef3e6d70d185c89b.tar.gz
Merge branch 'jc/maint-checkout-index-to-prefix' into maint
* jc/maint-checkout-index-to-prefix: check_path(): allow symlinked directories to checkout-index --prefix
Diffstat (limited to 'cache.h')
-rw-r--r--cache.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/cache.h b/cache.h
index 9222774e6c..2c2f05c3e0 100644
--- a/cache.h
+++ b/cache.h
@@ -469,7 +469,7 @@ extern int index_path(unsigned char *sha1, const char *path, struct stat *st, in
extern void fill_stat_cache_info(struct cache_entry *ce, struct stat *st);
/* "careful lstat()" */
-extern int check_path(const char *path, int len, struct stat *st);
+extern int check_path(const char *path, int len, struct stat *st, int skiplen);
#define REFRESH_REALLY 0x0001 /* ignore_valid */
#define REFRESH_UNMERGED 0x0002 /* allow unmerged */