summaryrefslogtreecommitdiff
path: root/dir.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-05-02 22:58:30 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-05-02 22:58:30 (GMT)
commitc67e367c50304c5a0701ae2bb8ecb7291f481ffd (patch)
tree6c4015ddf403faec0ed182c39341cb42e670f878 /dir.h
parent2db8926236406a4e4cb17d1b9c4b791706fb0512 (diff)
parentb892913d51795ee66d825bedd23e5c4ffe85ebb2 (diff)
downloadgit-c67e367c50304c5a0701ae2bb8ecb7291f481ffd.zip
git-c67e367c50304c5a0701ae2bb8ecb7291f481ffd.tar.gz
git-c67e367c50304c5a0701ae2bb8ecb7291f481ffd.tar.bz2
Merge branch 'nd/maint-setup'
* nd/maint-setup: Kill off get_relative_cwd() setup: return correct prefix if worktree is '/' Conflicts: dir.c setup.c
Diffstat (limited to 'dir.h')
-rw-r--r--dir.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/dir.h b/dir.h
index aa511da..433b5b4 100644
--- a/dir.h
+++ b/dir.h
@@ -85,8 +85,8 @@ extern void add_exclude(const char *string, const char *base,
extern void free_excludes(struct exclude_list *el);
extern int file_exists(const char *);
-extern char *get_relative_cwd(char *buffer, int size, const char *dir);
extern int is_inside_dir(const char *dir);
+extern int dir_inside_of(const char *subdir, const char *dir);
static inline int is_dot_or_dotdot(const char *name)
{