Merge branch 'jc/abbrev-guard'

diff --git a/cache.h b/cache.h
index 931fb597ee53be6bd8272025988da2be36b62fa3..e56a0a23ae9e81ea4b691c6d365491a6ecb41f62 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -860,7 +860,7 @@ struct cache_def {
 
 extern int has_symlink_leading_path(const char *name, int len);
 extern int threaded_has_symlink_leading_path(struct cache_def *, const char *, int);
-extern int has_symlink_or_noent_leading_path(const char *name, int len);
+extern int check_leading_path(const char *name, int len);
 extern int has_dirs_only_path(const char *name, int len, int prefix_len);
 extern void schedule_dir_for_removal(const char *name, int len);
 extern void remove_scheduled_dirs(void);