core: Should write remote refs in refs/<remote>/<branch>
Not just refs/<branch>, otherwise multiple remotes conflict.
This commit is contained in:
parent
db9801bff2
commit
ed2be6306d
|
|
@ -1342,14 +1342,32 @@ add_one_path_to_tree_and_import (OstreeRepo *self,
|
||||||
|
|
||||||
gboolean
|
gboolean
|
||||||
ostree_repo_write_ref (OstreeRepo *self,
|
ostree_repo_write_ref (OstreeRepo *self,
|
||||||
gboolean is_local,
|
const char *remote,
|
||||||
const char *name,
|
const char *name,
|
||||||
const char *rev,
|
const char *rev,
|
||||||
GError **error)
|
GError **error)
|
||||||
{
|
{
|
||||||
|
gboolean ret = FALSE;
|
||||||
OstreeRepoPrivate *priv = GET_PRIVATE (self);
|
OstreeRepoPrivate *priv = GET_PRIVATE (self);
|
||||||
return write_checksum_file (is_local ? priv->local_heads_dir : priv->remote_heads_dir,
|
GFile *dir = NULL;
|
||||||
name, rev, error);
|
|
||||||
|
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
|
static gboolean
|
||||||
|
|
@ -1389,7 +1407,7 @@ commit_parsed_tree (OstreeRepo *self,
|
||||||
commit, &ret_commit, error))
|
commit, &ret_commit, error))
|
||||||
goto out;
|
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;
|
goto out;
|
||||||
|
|
||||||
ret = TRUE;
|
ret = TRUE;
|
||||||
|
|
|
||||||
|
|
@ -91,7 +91,7 @@ gboolean ostree_repo_resolve_rev (OstreeRepo *self,
|
||||||
GError **error);
|
GError **error);
|
||||||
|
|
||||||
gboolean ostree_repo_write_ref (OstreeRepo *self,
|
gboolean ostree_repo_write_ref (OstreeRepo *self,
|
||||||
gboolean is_local,
|
const char *remote,
|
||||||
const char *name,
|
const char *name,
|
||||||
const char *rev,
|
const char *rev,
|
||||||
GError **error);
|
GError **error);
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue