From 48507624c2c65dbf86f6686a6b98344d70cae599 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Sun, 27 Nov 2011 18:46:11 -0500 Subject: [PATCH] core: Don't default to "master" for show, there is no default branch anymore --- src/ostree/ot-builtin-show.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/ostree/ot-builtin-show.c b/src/ostree/ot-builtin-show.c index c524c7a2..30b1e392 100644 --- a/src/ostree/ot-builtin-show.c +++ b/src/ostree/ot-builtin-show.c @@ -182,10 +182,10 @@ ostree_builtin_show (int argc, char **argv, const char *repo_path, GError **erro GOptionContext *context; gboolean ret = FALSE; OstreeRepo *repo = NULL; - const char *rev = "master"; + const char *rev; char *resolved_rev = NULL; - context = g_option_context_new ("- Output a metadata object"); + context = g_option_context_new ("OBJECT - Output a metadata object"); g_option_context_add_main_entries (context, options, NULL); if (!g_option_context_parse (context, &argc, &argv, error)) @@ -195,8 +195,12 @@ ostree_builtin_show (int argc, char **argv, const char *repo_path, GError **erro if (!ostree_repo_check (repo, error)) goto out; - if (argc > 1) - rev = argv[1]; + if (argc <= 1) + { + ot_util_usage_error (context, "An object argument is required", error); + goto out; + } + rev = argv[1]; if (print_packfile) {