aboutsummaryrefslogtreecommitdiff
path: root/cache.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-06-25 11:19:33 -0700
committerJunio C Hamano <gitster@pobox.com>2008-06-25 11:19:33 -0700
commit41cb0fc100c2e00e2978c91d7d0b8b51167c1243 (patch)
treed7b0b1dc5f7e527fc6c9ad8a01d381b2a83c0b41 /cache.h
parent340a6b58da21442492650f0e1d7e25be5253c677 (diff)
parent044bbbcb63281dfdb78344ada2c44c96122dc822 (diff)
downloadgit-41cb0fc100c2e00e2978c91d7d0b8b51167c1243.tar.gz
git-41cb0fc100c2e00e2978c91d7d0b8b51167c1243.tar.xz
Merge branch 'lt/maint-gitdir-relative' into maint
* lt/maint-gitdir-relative: Make git_dir a path relative to work_tree in setup_work_tree()
Diffstat (limited to 'cache.h')
-rw-r--r--cache.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/cache.h b/cache.h
index 81b7e17de..56ac6e7f4 100644
--- a/cache.h
+++ b/cache.h
@@ -525,6 +525,7 @@ static inline int is_absolute_path(const char *path)
}
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);
/* Read and unpack a sha1 file into memory, write memory to a sha1 file */
extern int sha1_object_info(const unsigned char *, unsigned long *);