Merge branch 'nd/checkout-disambiguation'

diff --git a/pathspec.h b/pathspec.h
index 4a80f6fc96a572681acd8aa8349b2c0b1237f9f1..59809e4793a20e3030462ec23bff2b5358283282 100644 (file)
--- a/pathspec.h
+++ b/pathspec.h
@@ -96,7 +96,5 @@ static inline int ps_strcmp(const struct pathspec_item *item,
 
 extern char *find_pathspecs_matching_against_index(const struct pathspec *pathspec);
 extern void add_pathspec_matches_against_index(const struct pathspec *pathspec, char *seen);
-extern const char *check_path_for_gitlink(const char *path);
-extern void die_if_path_beyond_symlink(const char *path, const char *prefix);
 
 #endif /* PATHSPEC_H */