aboutsummaryrefslogtreecommitdiff
path: root/cache.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-08-25 14:47:56 -0700
committerJunio C Hamano <gitster@pobox.com>2009-08-25 14:47:56 -0700
commit3613339eaf3638f7a22ee55f914308f8bab5f2cf (patch)
tree1721427f802507e63211f24db2dc41ad36184e43 /cache.h
parent079f298513f9875dfd9f2eaaacc58c294c546571 (diff)
parentda02ca508b842e61c71d920310ff30bbe0238993 (diff)
downloadgit-3613339eaf3638f7a22ee55f914308f8bab5f2cf.tar.gz
git-3613339eaf3638f7a22ee55f914308f8bab5f2cf.tar.xz
Merge branch 'jc/maint-checkout-index-to-prefix'
* 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 f79378937..dd7f71eba 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 */