[libgit2-glib] Bind ggit_index_has_conflicts
- From: Jesse van den Kieboom <jessevdk src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libgit2-glib] Bind ggit_index_has_conflicts
- Date: Wed, 12 Aug 2015 06:52:33 +0000 (UTC)
commit 6d6bef902140bd0e2b3cabd7af5103f68dc12282
Author: Jesse van den Kieboom <jessevdk gnome org>
Date: Wed Aug 12 08:51:53 2015 +0200
Bind ggit_index_has_conflicts
libgit2-glib/ggit-index.c | 17 +++++++++++++++++
libgit2-glib/ggit-index.h | 2 ++
2 files changed, 19 insertions(+), 0 deletions(-)
---
diff --git a/libgit2-glib/ggit-index.c b/libgit2-glib/ggit-index.c
index 8a54387..2bf918c 100644
--- a/libgit2-glib/ggit-index.c
+++ b/libgit2-glib/ggit-index.c
@@ -546,6 +546,23 @@ ggit_index_get_owner (GgitIndex *idx)
}
/**
+ * ggit_index_has_conflicts:
+ * @idx: a #GgitIndex.
+ *
+ * Get whether the index has any conflicts.
+ *
+ * Returns: %TRUE if the index has any conflicts, %FALSE otherwise.
+ *
+ **/
+gboolean
+ggit_index_has_conflicts (GgitIndex *idx)
+{
+ g_return_val_if_fail (GGIT_IS_INDEX (idx), FALSE);
+
+ return git_index_has_conflicts (_ggit_native_get (idx));
+}
+
+/**
* ggit_index_write_tree:
* @idx: a #GgitIndex.
* @error: a #GError for error reporting, or %NULL.
diff --git a/libgit2-glib/ggit-index.h b/libgit2-glib/ggit-index.h
index b3271d0..7385943 100644
--- a/libgit2-glib/ggit-index.h
+++ b/libgit2-glib/ggit-index.h
@@ -67,6 +67,8 @@ gboolean ggit_index_add_path (GgitIndex *
GgitRepository *ggit_index_get_owner (GgitIndex *idx);
+gboolean ggit_index_has_conflicts (GgitIndex *idx);
+
GgitIndexEntries *ggit_index_get_entries (GgitIndex *idx);
GgitIndexEntriesResolveUndo *
ggit_index_get_entries_resolve_undo (GgitIndex *idx);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]