diff options
author | Junio C Hamano <gitster@pobox.com> | 2013-01-02 10:36:59 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2013-01-02 10:36:59 -0800 |
commit | f470e901f21d7a2b408c3e54e33e07bcc94913b1 (patch) | |
tree | 4b4c91cd6bbf23000e95af2b3d3ed2ab3832b6db /string-list.h | |
parent | 5d417842efeafb6e109db7574196901c4e95d273 (diff) | |
parent | 059b37934c611b1b9b735e0310ba282a0c7f5eba (diff) | |
download | git-f470e901f21d7a2b408c3e54e33e07bcc94913b1.tar.gz |
Merge branch 'mh/ceiling'
An element on GIT_CEILING_DIRECTORIES list that does not name the
real path to a directory (i.e. a symbolic link) could have caused
the GIT_DIR discovery logic to escape the ceiling.
* mh/ceiling:
string_list_longest_prefix(): remove function
setup_git_directory_gently_1(): resolve symlinks in ceiling paths
longest_ancestor_length(): require prefix list entries to be normalized
longest_ancestor_length(): take a string_list argument for prefixes
longest_ancestor_length(): use string_list_split()
Introduce new function real_path_if_valid()
real_path_internal(): add comment explaining use of cwd
Introduce new static function real_path_internal()
Diffstat (limited to 'string-list.h')
-rw-r--r-- | string-list.h | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/string-list.h b/string-list.h index c50b0d0dea..db1284861a 100644 --- a/string-list.h +++ b/string-list.h @@ -45,15 +45,6 @@ void filter_string_list(struct string_list *list, int free_util, */ void string_list_remove_empty_items(struct string_list *list, int free_util); -/* - * Return the longest string in prefixes that is a prefix (in the - * sense of prefixcmp()) of string, or NULL if no such prefix exists. - * This function does not require the string_list to be sorted (it - * does a linear search). - */ -char *string_list_longest_prefix(const struct string_list *prefixes, const char *string); - - /* Use these functions only on sorted lists: */ int string_list_has_string(const struct string_list *list, const char *string); int string_list_find_insert_index(const struct string_list *list, const char *string, |