From a167bb7342f41a805124f7f7dbb4306c09619524 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Sat, 29 Jun 2013 11:44:26 -0400 Subject: [PATCH] pull-local: Support --remote argument For offline upgrades, pull-local can now write the refs into a specific remote, rather than using the local heads. --- src/ostree/ot-builtin-pull-local.c | 8 ++++++-- tests/t0000-basic.sh | 10 +++++++++- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/src/ostree/ot-builtin-pull-local.c b/src/ostree/ot-builtin-pull-local.c index f0c10df8..1f760db3 100644 --- a/src/ostree/ot-builtin-pull-local.c +++ b/src/ostree/ot-builtin-pull-local.c @@ -28,7 +28,10 @@ #include #include +static char *opt_remote; + static GOptionEntry options[] = { + { "remote", 0, 0, G_OPTION_ARG_STRING, &opt_remote, "Add REMOTE to refspec", "REMOTE" }, { NULL } }; @@ -310,8 +313,9 @@ ostree_builtin_pull_local (int argc, char **argv, GFile *repo_path, GError **err { const char *name = key; const char *checksum = value; - - if (!ostree_repo_write_ref (data->dest_repo, NULL, name, checksum, error)) + + if (!ostree_repo_write_ref (data->dest_repo, opt_remote, name, checksum, + error)) goto out; } diff --git a/tests/t0000-basic.sh b/tests/t0000-basic.sh index a55c748c..4943a916 100755 --- a/tests/t0000-basic.sh +++ b/tests/t0000-basic.sh @@ -19,7 +19,7 @@ set -e -echo "1..30" +echo "1..31" . $(dirname $0)/libtest.sh @@ -218,3 +218,11 @@ echo "ok subdir enoent" cd ${test_tmpdir} $OSTREE checkout test2 --allow-noent --subpath /enoent 2>/dev/null echo "ok subdir noent" + +cd ${test_tmpdir} +mkdir repo3 +${CMD_PREFIX} ostree --repo=repo3 init +${CMD_PREFIX} ostree --repo=repo3 pull-local --remote=aremote repo test2 +ostree --repo=repo3 rev-parse aremote/test2 +echo "ok pull-local with --remote arg" +