summaryrefslogtreecommitdiff
path: root/cache.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-12-16 20:51:05 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-12-16 20:51:05 (GMT)
commit620b89cd98219db33ce499c7f8e50d091fe9b598 (patch)
tree0838749541fdf9f5fe36466bddc6d3d4167a0248 /cache.h
parentf68b780b2575628eca75e9502e4997f98ad2af3b (diff)
parent3d6e0f745e5b958387c9116ff5ba6247b990e6e7 (diff)
downloadgit-620b89cd98219db33ce499c7f8e50d091fe9b598.zip
git-620b89cd98219db33ce499c7f8e50d091fe9b598.tar.gz
git-620b89cd98219db33ce499c7f8e50d091fe9b598.tar.bz2
Merge branch 'nd/extended-sha1-relpath'
* nd/extended-sha1-relpath: get_sha1: teach ":$n:<path>" the same relative path logic get_sha1: support relative path ":path" syntax Make prefix_path() return char* without const Conflicts: sha1_name.c
Diffstat (limited to 'cache.h')
-rw-r--r--cache.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/cache.h b/cache.h
index 194f784..b455258 100644
--- a/cache.h
+++ b/cache.h
@@ -428,7 +428,7 @@ extern const char **get_pathspec(const char *prefix, const char **pathspec);
extern void setup_work_tree(void);
extern const char *setup_git_directory_gently(int *);
extern const char *setup_git_directory(void);
-extern const char *prefix_path(const char *prefix, int len, const char *path);
+extern char *prefix_path(const char *prefix, int len, const char *path);
extern const char *prefix_filename(const char *prefix, int len, const char *path);
extern int check_filename(const char *prefix, const char *name);
extern void verify_filename(const char *prefix, const char *name);