packaging
/
ostree
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

core: Should write remote refs in refs/<remote>/<branch> 

Not just refs/<branch>, otherwise multiple remotes conflict.
This commit is contained in:
Colin Walters 2011-11-17 10:40:01 -05:00
parent db9801bff2
commit ed2be6306d
2 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/libostree/ostree-repo.c
View File

@ -1342,14 +1342,32 @@ add_one_path_to_tree_and_import (OstreeRepo *self,
gboolean
ostree_repo_write_ref (OstreeRepo *self,
gboolean is_local,
const char *remote,
const char *name,
const char *rev,
GError **error)
{
gboolean ret = FALSE;
OstreeRepoPrivate *priv = GET_PRIVATE (self);
return write_checksum_file (is_local ? priv->local_heads_dir : priv->remote_heads_dir,
name, rev, error);
GFile *dir = NULL;
if (remote == NULL)
dir = g_object_ref (priv->local_heads_dir);
else
{
dir = g_file_get_child (priv->remote_heads_dir, remote);
if (!ot_util_ensure_directory (ot_gfile_get_path_cached (dir), FALSE, error))
goto out;
}
if (!write_checksum_file (dir, name, rev, error))
goto out;
ret = TRUE;
out:
g_clear_object (&dir);
return ret;
}
static gboolean
@ -1389,7 +1407,7 @@ commit_parsed_tree (OstreeRepo *self,
commit, &ret_commit, error))
goto out;
if (!ostree_repo_write_ref (self, TRUE, branch, g_checksum_get_string (ret_commit), error))
if (!ostree_repo_write_ref (self, NULL, branch, g_checksum_get_string (ret_commit), error))
goto out;
ret = TRUE;

2
src/libostree/ostree-repo.h
View File

@ -91,7 +91,7 @@ gboolean ostree_repo_resolve_rev (OstreeRepo *self,
GError **error);
gboolean ostree_repo_write_ref (OstreeRepo *self,
gboolean is_local,
const char *remote,
const char *name,
const char *rev,
GError **error);