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

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
This commit is contained in:
Jonathan Lebon 2016-03-29 23:27:19 -04:00 committed by Colin Walters (automation)
parent 23d26d5f65
commit 9260d3dba1
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/ostree/ot-builtin-commit.c
View File

@ -194,9 +194,8 @@ commit_editor (OstreeRepo *repo,
input = g_strdup_printf ("\n" input = g_strdup_printf ("\n"
"# Please enter the commit message for your changes. The first line will\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" "# become the subject, and the remainder the body. Lines starting\n"
"# with '#' will be ignored, and an empty message aborts the commit.\n" "# with '#' will be ignored, and an empty message aborts the commit."
"#\n" "%s%s\n", branch ? "\n#\n# Branch: " : "", branch ?: "");
"# Branch: %s\n", branch);
output = ot_editor_prompt (repo, input, cancellable, error); output = ot_editor_prompt (repo, input, cancellable, error);
if (output == NULL) if (output == NULL)
@ -382,7 +381,7 @@ ostree_builtin_commit (int argc, char **argv, GCancellable *cancellable, GError
goto out; 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)) if (!commit_editor (repo, opt_branch, &opt_subject, &opt_body, cancellable, error))
goto out; goto out;