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
This commit is contained in:
Junio C Hamano
2011-05-02 15:58:30 -07:00
3 changed files with 34 additions and 45 deletions

2
dir.h
View File

@@ -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)
{