From 9260d3dba1dc1d22a612161543e46ef22dce18fd Mon Sep 17 00:00:00 2001 From: Jonathan Lebon Date: Tue, 29 Mar 2016 23:27:19 -0400 Subject: [PATCH] commit: support editor for orphan commits This is a follow up to #227 to allow ostree to open the editor also for orphan commits when no subject or body is given on the cmdline. Closes: #229 Approved by: cgwalters --- src/ostree/ot-builtin-commit.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/ostree/ot-builtin-commit.c b/src/ostree/ot-builtin-commit.c index 2c74d4d7..1d96855d 100644 --- a/src/ostree/ot-builtin-commit.c +++ b/src/ostree/ot-builtin-commit.c @@ -194,9 +194,8 @@ commit_editor (OstreeRepo *repo, input = g_strdup_printf ("\n" "# Please enter the commit message for your changes. The first line will\n" "# become the subject, and the remainder the body. Lines starting\n" - "# with '#' will be ignored, and an empty message aborts the commit.\n" - "#\n" - "# Branch: %s\n", branch); + "# with '#' will be ignored, and an empty message aborts the commit." + "%s%s\n", branch ? "\n#\n# Branch: " : "", branch ?: ""); output = ot_editor_prompt (repo, input, cancellable, error); if (output == NULL) @@ -382,7 +381,7 @@ ostree_builtin_commit (int argc, char **argv, GCancellable *cancellable, GError goto out; } - if (!opt_subject && !opt_body && !opt_orphan) + if (!opt_subject && !opt_body) { if (!commit_editor (repo, opt_branch, &opt_subject, &opt_body, cancellable, error)) goto out;