Commit 987f565917ed92094184384eb61c38d17e9e47f5
2017-04-04T17:12:22
repository: extract function to get path to a file in a work tree The function `read_worktree_head` has the logic embedded to construct the path to `HEAD` in the work tree's git directory, which is quite useful for other callers. Extract the logic into its own function to make it reusable by others.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37
diff --git a/src/repository.c b/src/repository.c
index 900a15d..f14eaf9 100644
--- a/src/repository.c
+++ b/src/repository.c
@@ -2063,6 +2063,12 @@ int git_repository_head_detached(git_repository *repo)
return exists;
}
+static int get_worktree_file_path(git_buf *out, git_repository *repo, const char *worktree, const char *file)
+{
+ git_buf_clear(out);
+ return git_buf_printf(out, "%s/worktrees/%s/%s", repo->commondir, worktree, file);
+}
+
static int read_worktree_head(git_buf *out, git_repository *repo, const char *name)
{
git_buf path = GIT_BUF_INIT;
@@ -2070,17 +2076,8 @@ static int read_worktree_head(git_buf *out, git_repository *repo, const char *na
assert(out && repo && name);
- git_buf_clear(out);
-
- if ((err = git_buf_printf(&path, "%s/worktrees/%s/HEAD", repo->commondir, name)) < 0)
- goto out;
- if (!git_path_exists(path.ptr))
- {
- err = -1;
- goto out;
- }
-
- if ((err = git_futils_readbuffer(out, path.ptr)) < 0)
+ if ((err = get_worktree_file_path(&path, repo, name, "HEAD")) < 0 ||
+ (err = git_futils_readbuffer(out, path.ptr)) < 0)
goto out;
git_buf_rtrim(out);