From 1f8db2a873c93a9c40f4f39512ea37e0ba552f47 Mon Sep 17 00:00:00 2001
From: "Jasper St. Pierre" <jstpierre@mecheye.net>
Date: Fri, 6 Sep 2013 20:09:44 -0400
Subject: [PATCH] repo: Drop the branch parameter from ostree_repo_commit

It's unused. Make users explicitly write a ref if they want this;
high-level convenience API will be introduced later.

https://bugzilla.gnome.org/show_bug.cgi?id=707727
---
 src/libostree/ostree-repo-commit.c | 21 +++++++++------------
 src/libostree/ostree-repo.h        |  1 -
 src/ostree/ot-builtin-commit.c     |  2 +-
 3 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/src/libostree/ostree-repo-commit.c b/src/libostree/ostree-repo-commit.c
index ca3a2dfc..a874af07 100644
--- a/src/libostree/ostree-repo-commit.c
+++ b/src/libostree/ostree-repo-commit.c
@@ -1190,7 +1190,6 @@ create_empty_gvariant_dict (void)
 /**
  * ostree_repo_write_commit:
  * @self: Repo
- * @branch: Name of ref
  * @parent: (allow-none): ASCII SHA256 checksum for parent, or %NULL for none
  * @subject: Subject
  * @body: Body
@@ -1204,16 +1203,15 @@ create_empty_gvariant_dict (void)
  * and @root_metadata_checksum.
  */
 gboolean
-ostree_repo_write_commit (OstreeRepo *self,
-                          const char   *branch,
-                          const char   *parent,
-                          const char   *subject,
-                          const char   *body,
-                          const char   *root_contents_checksum,
-                          const char   *root_metadata_checksum,
-                          char        **out_commit,
-                          GCancellable *cancellable,
-                          GError      **error)
+ostree_repo_write_commit (OstreeRepo    *self,
+                          const char    *parent,
+                          const char    *subject,
+                          const char    *body,
+                          const char    *root_contents_checksum,
+                          const char    *root_metadata_checksum,
+                          char         **out_commit,
+                          GCancellable  *cancellable,
+                          GError       **error)
 {
   gboolean ret = FALSE;
   gs_free char *ret_commit = NULL;
@@ -1221,7 +1219,6 @@ ostree_repo_write_commit (OstreeRepo *self,
   gs_free guchar *commit_csum = NULL;
   GDateTime *now = NULL;
 
-  g_return_val_if_fail (branch != NULL, FALSE);
   g_return_val_if_fail (subject != NULL, FALSE);
   g_return_val_if_fail (root_contents_checksum != NULL, FALSE);
   g_return_val_if_fail (root_metadata_checksum != NULL, FALSE);
diff --git a/src/libostree/ostree-repo.h b/src/libostree/ostree-repo.h
index c02ec98e..ab4c4c79 100644
--- a/src/libostree/ostree-repo.h
+++ b/src/libostree/ostree-repo.h
@@ -315,7 +315,6 @@ gboolean      ostree_repo_write_mtree (OstreeRepo         *self,
                                        GError            **error);
 
 gboolean      ostree_repo_write_commit (OstreeRepo   *self,
-                                        const char   *branch,
                                         const char   *parent,
                                         const char   *subject,
                                         const char   *body,
diff --git a/src/ostree/ot-builtin-commit.c b/src/ostree/ot-builtin-commit.c
index 329cd532..fd52a3e1 100644
--- a/src/ostree/ot-builtin-commit.c
+++ b/src/ostree/ot-builtin-commit.c
@@ -404,7 +404,7 @@ ostree_builtin_commit (int argc, char **argv, OstreeRepo *repo, GCancellable *ca
           goto out;
         }
 
-      if (!ostree_repo_write_commit (repo, opt_branch, parent, opt_subject, opt_body,
+      if (!ostree_repo_write_commit (repo, parent, opt_subject, opt_body,
                                      contents_checksum, root_metadata,
                                      &commit_checksum, cancellable, error))
         goto out;