author | Junio C Hamano <gitster@pobox.com> | |
Thu, 30 Jun 2011 00:09:17 +0000 (17:09 -0700) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Thu, 30 Jun 2011 00:09:17 +0000 (17:09 -0700) |
* ef/maint-win-verify-path:
verify_dotfile(): do not assume '/' is the path seperator
verify_path(): simplify check at the directory boundary
verify_path: consider dos drive prefix
real_path: do not assume '/' is the path seperator
A Windows path starting with a backslash is absolute
verify_dotfile(): do not assume '/' is the path seperator
verify_path(): simplify check at the directory boundary
verify_path: consider dos drive prefix
real_path: do not assume '/' is the path seperator
A Windows path starting with a backslash is absolute
1 | 2 | |||
---|---|---|---|---|
abspath.c | patch | | diff1 | | diff2 | | blob | history |
cache.h | patch | | diff1 | | diff2 | | blob | history |
compat/mingw.h | patch | | diff1 | | diff2 | | blob | history |
git-compat-util.h | patch | | diff1 | | diff2 | | blob | history |
read-cache.c | patch | | diff1 | | diff2 | | blob | history |
diff --cc abspath.c
Simple merge
diff --cc cache.h
index e11cf6ab1c73ac97c94e76e8c8699d55af95b978,9d3d92cf9e1c7989fd46b77c61fceb0375dbcc4c..f4bb43ec6aa3e910e8a7d2ba2d9f06440e400fc2
+++ b/cache.h
char *enter_repo(char *path, int strict);
static inline int is_absolute_path(const char *path)
{
- return path[0] == '/' || has_dos_drive_prefix(path);
+ return is_dir_sep(path[0]) || has_dos_drive_prefix(path);
}
int is_directory(const char *);
-const char *make_absolute_path(const char *path);
-const char *make_nonrelative_path(const char *path);
-const char *make_relative_path(const char *abs, const char *base);
+const char *real_path(const char *path);
+const char *absolute_path(const char *path);
+const char *relative_path(const char *abs, const char *base);
int normalize_path_copy(char *dst, const char *src);
int longest_ancestor_length(const char *path, const char *prefix_list);
char *strip_path_suffix(const char *path, const char *suffix);
diff --cc compat/mingw.h
Simple merge
diff --cc git-compat-util.h
Simple merge
diff --cc read-cache.c
Simple merge