use absolute path for reference in got/worktree namespace
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 38 39 40 41 42 43 44 45
diff --git a/lib/got_lib_worktree.h b/lib/got_lib_worktree.h
index 84f3dc1..9809abf 100644
--- a/lib/got_lib_worktree.h
+++ b/lib/got_lib_worktree.h
@@ -61,7 +61,7 @@ struct got_commitable {
#define GOT_WORKTREE_FORMAT_VERSION 1
#define GOT_WORKTREE_INVALID_COMMIT_ID GOT_SHA1_STRING_ZERO
-#define GOT_WORKTREE_BASE_REF_PREFIX "got/worktree/base"
+#define GOT_WORKTREE_BASE_REF_PREFIX "refs/got/worktree/base"
const struct got_error *got_worktree_get_base_ref_name(char **,
struct got_worktree *worktree);
diff --git a/regress/worktree/worktree_test.c b/regress/worktree/worktree_test.c
index 6cfa9ea..a64a349 100644
--- a/regress/worktree/worktree_test.c
+++ b/regress/worktree/worktree_test.c
@@ -89,17 +89,13 @@ remove_worktree_base_ref(struct got_worktree *worktree,
{
const struct got_error *err = NULL;
struct got_reference *base_ref = NULL;
- char *refname = NULL, *absrefname = NULL;
+ char *refname = NULL;
err = got_worktree_get_base_ref_name(&refname, worktree);
if (err)
return err;
- if (asprintf(&absrefname, "refs/%s", refname) == -1) {
- err = got_error_from_errno("asprintf");
- goto done;
- }
- err = got_ref_open(&base_ref, repo, absrefname, 0);
+ err = got_ref_open(&base_ref, repo, refname, 0);
if (err)
goto done;
@@ -108,7 +104,6 @@ done:
if (base_ref)
got_ref_close(base_ref);
free(refname);
- free(absrefname);
return err;
}