summaryrefslogtreecommitdiff
path: root/setup.c
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 /setup.c
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 'setup.c')
-rw-r--r--setup.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/setup.c b/setup.c
index 14f91e3..91887a4 100644
--- a/setup.c
+++ b/setup.c
@@ -4,7 +4,7 @@
static int inside_git_dir = -1;
static int inside_work_tree = -1;
-const char *prefix_path(const char *prefix, int len, const char *path)
+char *prefix_path(const char *prefix, int len, const char *path)
{
const char *orig = path;
char *sanitized = xmalloc(len + strlen(path) + 1);