summaryrefslogtreecommitdiff
path: root/src/repository.c
diff options
context:
space:
mode:
authornulltoken <emeric.fermas@gmail.com>2012-04-10 14:03:47 +0200
committerVicent Martí <tanoku@gmail.com>2012-04-11 12:40:21 +0200
commitb78fb64d2f5c1b9e2e834e05e042271147c8d188 (patch)
tree807091971c8ca681cb4e78c6c0ca4bc326bf1797 /src/repository.c
parentdcfdb958e2033aa59beb624da4263ce031fbb21e (diff)
downloadlibgit2-b78fb64d2f5c1b9e2e834e05e042271147c8d188.tar.gz
repository: make git_repository_set_workdir() prettify the path it is being passed
Diffstat (limited to 'src/repository.c')
-rw-r--r--src/repository.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/repository.c b/src/repository.c
index 4e0f9d491..ce313280e 100644
--- a/src/repository.c
+++ b/src/repository.c
@@ -871,13 +871,16 @@ const char *git_repository_workdir(git_repository *repo)
int git_repository_set_workdir(git_repository *repo, const char *workdir)
{
+ git_buf path = GIT_BUF_INIT;
+
assert(repo && workdir);
- free(repo->workdir);
+ if (git_path_prettify_dir(&path, workdir, NULL) < 0)
+ return -1;
- repo->workdir = git__strdup(workdir);
- GITERR_CHECK_ALLOC(repo->workdir);
+ free(repo->workdir);
+ repo->workdir = git_buf_detach(&path);
repo->is_bare = 0;
return 0;
}