diff -Nru libgit2-glib-0.23.10/ChangeLog libgit2-glib-0.24.0/ChangeLog --- libgit2-glib-0.23.10/ChangeLog 2016-02-05 16:21:09.000000000 +0000 +++ libgit2-glib-0.24.0/ChangeLog 2016-03-14 23:14:08.000000000 +0000 @@ -1,6 +1,115 @@ +commit 541c8983303644ad6ba7bb82a4c164ae01ba8cf5 +Author: Ignacio Casal Quinteiro +Date: 2016-03-15 + + remote: allow none for the custom headers + +M libgit2-glib/ggit-remote.c + +commit d60477618023c46d142f58af635ffdc4328858bc +Author: Ignacio Casal Quinteiro +Date: 2016-03-15 + + types: fix asserts for GgitMergeFlags + +M libgit2-glib/ggit-types.c + +commit 4fa323ae1af3950a133e009471144ef5b8182170 +Author: Ignacio Casal Quinteiro +Date: 2016-03-14 + + types: fix api break in GgitConfigLevel + +M libgit2-glib/ggit-types.c +M libgit2-glib/ggit-types.h + +commit 306406de0ee3d07d0ef36fab870a5828897c125f +Author: Ignacio Casal Quinteiro +Date: 2016-03-14 + + remote: fix api break + +M libgit2-glib/ggit-remote.c +M libgit2-glib/ggit-remote.h + +commit b230b493780fbc686c4cdbd840d16569b577e120 +Author: Ignacio Casal Quinteiro +Date: 2016-03-14 + + merge: fix api break + +M libgit2-glib/ggit-merge-options.c +M libgit2-glib/ggit-merge-options.h +M libgit2-glib/ggit-types.h + +commit ae37748f4b444b6f0f8abfd4eb2f516839b38430 +Author: Ignacio Casal Quinteiro +Date: 2016-03-14 + + commit: fix uninitialized variable + +M libgit2-glib/ggit-commit.c + +commit 150990f2d5e7c4e01c7b695f56c022a50b27aa3f +Author: Jeongsu Kim +Date: 2016-02-23 + + Fix crash when signature is used after the commit is unreffed. + + The signature might be kept after the commit is unreffed so we + need to duplicate it before wrapping it. + + https://bugzilla.gnome.org/show_bug.cgi?id=762427 + +M libgit2-glib/ggit-commit.c + +commit 2646dcf4a7932cf9e41135826b264191610acdb1 +Author: Ignacio Casal Quinteiro +Date: 2016-02-13 + + signature: minor style fix + +M libgit2-glib/ggit-signature.c + +commit 2d17b3b9d84886a4401aed942be2e31d444e87e0 +Author: Ignacio Casal Quinteiro +Date: 2016-02-13 + + signature: be safe against a possible NULL date time + +M libgit2-glib/ggit-signature.c + +commit ef07d918053669871110d4ada8708c4cd03722d2 +Author: Ignacio Casal Quinteiro +Date: 2016-02-05 + + Updates on the docs reference + +M docs/reference/libgit2-glib-1.0-docs.sgml +M docs/reference/libgit2-glib-1.0-sections.txt +M libgit2-glib/ggit-checkout-options.c + +commit 797cf48c9e7ef86603ae1e0d2c16c78b78974a40 +Author: Ignacio Casal Quinteiro +Date: 2016-02-05 + + Post release version bump + +M configure.ac + +commit e3816015a17a30db439e1a7d7754edf05986a8c7 +Author: Ignacio Casal Quinteiro +Date: 2016-02-05 + + Release 0.23.10 + +M NEWS +M README +M configure.ac + commit 6d11e4247334a1fb7d6b207df661598a8435b9e4 Author: Jesse van den Kieboom -Date: 2015-12-30 +Date: 2015-12-30 Protected against empty signature diff -Nru libgit2-glib-0.23.10/configure libgit2-glib-0.24.0/configure --- libgit2-glib-0.23.10/configure 2016-02-05 16:20:35.000000000 +0000 +++ libgit2-glib-0.24.0/configure 2016-03-14 23:13:42.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for libgit2-glib 0.23.10. +# Generated by GNU Autoconf 2.69 for libgit2-glib 0.24.0. # # Report bugs to . # @@ -591,8 +591,8 @@ # Identity of this package. PACKAGE_NAME='libgit2-glib' PACKAGE_TARNAME='libgit2-glib' -PACKAGE_VERSION='0.23.10' -PACKAGE_STRING='libgit2-glib 0.23.10' +PACKAGE_VERSION='0.24.0' +PACKAGE_STRING='libgit2-glib 0.24.0' PACKAGE_BUGREPORT='https://bugzilla.gnome.org/enter_bug.cgi?product=gitg' PACKAGE_URL='' @@ -1403,7 +1403,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures libgit2-glib 0.23.10 to adapt to many kinds of systems. +\`configure' configures libgit2-glib 0.24.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1473,7 +1473,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libgit2-glib 0.23.10:";; + short | recursive ) echo "Configuration of libgit2-glib 0.24.0:";; esac cat <<\_ACEOF @@ -1618,7 +1618,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libgit2-glib configure 0.23.10 +libgit2-glib configure 0.24.0 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1987,7 +1987,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by libgit2-glib $as_me 0.23.10, which was +It was created by libgit2-glib $as_me 0.24.0, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2877,7 +2877,7 @@ # Define the identity of the package. PACKAGE='libgit2-glib' - VERSION='0.23.10' + VERSION='0.24.0' cat >>confdefs.h <<_ACEOF @@ -12379,7 +12379,7 @@ # Define the identity of the package. PACKAGE='libgit2-glib' - VERSION='0.23.10' + VERSION='0.24.0' cat >>confdefs.h <<_ACEOF @@ -15700,7 +15700,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by libgit2-glib $as_me 0.23.10, which was +This file was extended by libgit2-glib $as_me 0.24.0, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -15766,7 +15766,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -libgit2-glib config.status 0.23.10 +libgit2-glib config.status 0.24.0 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -Nru libgit2-glib-0.23.10/configure.ac libgit2-glib-0.24.0/configure.ac --- libgit2-glib-0.23.10/configure.ac 2016-02-05 16:19:22.000000000 +0000 +++ libgit2-glib-0.24.0/configure.ac 2016-03-14 23:12:22.000000000 +0000 @@ -1,8 +1,8 @@ AC_PREREQ([2.63]) m4_define(libgit2_glib_major_version, 0) -m4_define(libgit2_glib_minor_version, 23) -m4_define(libgit2_glib_micro_version, 10) +m4_define(libgit2_glib_minor_version, 24) +m4_define(libgit2_glib_micro_version, 0) m4_define(libgit2_glib_version, libgit2_glib_major_version.libgit2_glib_minor_version.libgit2_glib_micro_version) AC_INIT([libgit2-glib], diff -Nru libgit2-glib-0.23.10/debian/changelog libgit2-glib-0.24.0/debian/changelog --- libgit2-glib-0.23.10/debian/changelog 2016-02-11 23:27:59.000000000 +0000 +++ libgit2-glib-0.24.0/debian/changelog 2016-04-14 04:07:54.000000000 +0000 @@ -1,3 +1,26 @@ +libgit2-glib (0.24.0-3) unstable; urgency=medium + + * Upload to unstable. + + -- Dmitry Smirnov Thu, 14 Apr 2016 14:07:51 +1000 + +libgit2-glib (0.24.0-2) experimental; urgency=medium + + * Added "Build-Depends-Package" field to .symbols file. + Thanks, Andreas Henriksson. + + -- Dmitry Smirnov Wed, 13 Apr 2016 11:31:11 +1000 + +libgit2-glib (0.24.0-1) experimental; urgency=medium + + * New upstream release [March 2016] (Closes: #819871). + * Build-Depends: + - libgit2-dev (>= 0.23.0) + + libgit2-dev (>= 0.24.0) + * Standards-Version: 3.9.7. + + -- Dmitry Smirnov Fri, 18 Mar 2016 06:27:21 +1100 + libgit2-glib (0.23.10-1) unstable; urgency=medium * New upstream release [February 2016]. diff -Nru libgit2-glib-0.23.10/debian/control libgit2-glib-0.24.0/debian/control --- libgit2-glib-0.23.10/debian/control 2016-02-11 23:27:26.000000000 +0000 +++ libgit2-glib-0.24.0/debian/control 2016-04-12 07:08:33.000000000 +0000 @@ -7,10 +7,10 @@ ,gobject-introspection ,pkg-config ,libgirepository1.0-dev - ,libgit2-dev (>= 0.23.0) + ,libgit2-dev (>= 0.24.0) ,libglib2.0-dev (>= 2.44.0) ,valac -Standards-Version: 3.9.6 +Standards-Version: 3.9.7 Homepage: https://wiki.gnome.org/Projects/Libgit2-glib Vcs-Browser: https://anonscm.debian.org/gitweb/?p=collab-maint/libgit2-glib.git Vcs-Git: https://anonscm.debian.org/collab-maint/libgit2-glib.git @@ -29,7 +29,7 @@ Depends: ${misc:Depends} ,libgit2-glib-1.0-0 (= ${binary:Version}) ,gir1.2-git2-glib-1.0 (= ${binary:Version}) - ,libgit2-dev (>= 0.23.0) + ,libgit2-dev (>= 0.24.0) ,libglib2.0-dev (>= 2.44.0) ,libgirepository1.0-dev Suggests: libgit2-glib-1.0-doc diff -Nru libgit2-glib-0.23.10/debian/libgit2-glib-1.0-0.symbols libgit2-glib-0.24.0/debian/libgit2-glib-1.0-0.symbols --- libgit2-glib-0.23.10/debian/libgit2-glib-1.0-0.symbols 2015-09-29 01:31:48.000000000 +0000 +++ libgit2-glib-0.24.0/debian/libgit2-glib-1.0-0.symbols 2016-04-13 01:29:26.000000000 +0000 @@ -1,4 +1,5 @@ libgit2-glib-1.0.so.0 libgit2-glib-1.0-0 #MINVER# +* Build-Depends-Package: libgit2-glib-1.0-dev ggit_annotated_commit_get_id@Base 0.23.6 ggit_annotated_commit_get_type@Base 0.23.6 ggit_annotated_commit_ref@Base 0.23.6 @@ -375,23 +376,26 @@ #MISSING: 0.0.20# ggit_merge_automerge_mode_get_type@Base 0.0.6 ggit_merge_file_favor_get_type@Base 0.0.20 ggit_merge_file_flags_get_type@Base 0.23.6 + ggit_merge_flags_get_type@Base 0.24.0 ggit_merge_options_copy@Base 0.0.20 ggit_merge_options_free@Base 0.0.20 ggit_merge_options_get_file_favor@Base 0.23.6 ggit_merge_options_get_file_flags@Base 0.23.6 + ggit_merge_options_get_flags@Base 0.24.0 ggit_merge_options_get_rename_threshold@Base 0.23.6 ggit_merge_options_get_similarity_metric@Base 0.23.6 ggit_merge_options_get_target_limit@Base 0.23.6 - ggit_merge_options_get_tree_flags@Base 0.23.6 +#MISSING: 0.24.0# ggit_merge_options_get_tree_flags@Base 0.23.6 ggit_merge_options_get_type@Base 0.0.20 ggit_merge_options_new@Base 0.0.20 ggit_merge_options_set_file_favor@Base 0.23.6 ggit_merge_options_set_file_flags@Base 0.23.6 + ggit_merge_options_set_flags@Base 0.24.0 ggit_merge_options_set_rename_threshold@Base 0.23.6 ggit_merge_options_set_similarity_metric@Base 0.23.6 ggit_merge_options_set_target_limit@Base 0.23.6 - ggit_merge_options_set_tree_flags@Base 0.23.6 - ggit_merge_tree_flags_get_type@Base 0.0.6 +#MISSING: 0.24.0# ggit_merge_options_set_tree_flags@Base 0.23.6 +#MISSING: 0.24.0# ggit_merge_tree_flags_get_type@Base 0.0.6 #MISSING: 0.0.20# ggit_merge_tree_options_copy@Base 0.0.6 #MISSING: 0.0.20# ggit_merge_tree_options_free@Base 0.0.6 #MISSING: 0.0.20# ggit_merge_tree_options_get_type@Base 0.0.6 diff -Nru libgit2-glib-0.23.10/docs/reference/html/api-index-full.html libgit2-glib-0.24.0/docs/reference/html/api-index-full.html --- libgit2-glib-0.23.10/docs/reference/html/api-index-full.html 2016-02-05 16:21:09.000000000 +0000 +++ libgit2-glib-0.24.0/docs/reference/html/api-index-full.html 2016-03-14 23:14:08.000000000 +0000 @@ -13,7 +13,9 @@ - - +
@@ -41,7 +41,7 @@ -const guchar * +const guchar * ggit_blob_get_raw_content () @@ -49,7 +49,7 @@ -gboolean +gboolean ggit_blob_is_binary () @@ -73,7 +73,7 @@

Object Hierarchy

-
    GObject
+
    GObject
     ╰── GgitObjectFactoryBase
         ╰── GgitNative
             ╰── GgitObject
@@ -87,9 +87,9 @@
 
Functions

 

 
ggit_blob_get_raw_content ()

-
const guchar *
+
const guchar *
 ggit_blob_get_raw_content (GgitBlob *blob,
-                           gsize *length);

+                           gsize *length);

 
Gets a read-only buffer with the raw contents of blob
 .

 
A pointer to the raw contents of blob
@@ -123,14 +123,14 @@
 

 
Returns

 
 the blob content or
-NULL if the blob does not have any content. 

+NULL if the blob does not have any content. 

 
[array length=length][element-type guchar]

 

 

 

 

 
ggit_blob_is_binary ()

-
gboolean
+
gboolean
 ggit_blob_is_binary (GgitBlob *blob);

 
Check whether the blob is binary.

 

@@ -150,7 +150,7 @@
 

 

 
Returns

-
 TRUE if the blob is binary, FALSE otherwise.

+
 TRUE if the blob is binary, FALSE otherwise.
diff -Nru libgit2-glib-0.23.10/docs/reference/html/GgitBlobOutputStream.html libgit2-glib-0.24.0/docs/reference/html/GgitBlobOutputStream.html --- libgit2-glib-0.23.10/docs/reference/html/GgitBlobOutputStream.html 2016-02-05 16:21:09.000000000 +0000 +++ libgit2-glib-0.24.0/docs/reference/html/GgitBlobOutputStream.html 2016-03-14 23:14:08.000000000 +0000 @@ -87,8 +87,8 @@

Object Hierarchy

-
    GObject
-    ╰── GOutputStream
+
    GObject
+    ╰── GOutputStream
         ╰── GgitBlobOutputStream
@@ -101,10 +101,10 @@

ggit_blob_output_stream_get_id ()

GgitOId *
 ggit_blob_output_stream_get_id (GgitBlobOutputStream *stream,
-                                GError **error);
+ GError **error);

Get the id of the written blob. The blob id is only available after the stream has been properly closed. If an error occurred while writing the blob, -the NULL is returned and error +the NULL is returned and error is set accordingly.

Parameters

@@ -122,7 +122,7 @@

error

-

a GError for error reporting, or NULL.

+

a GError for error reporting, or NULL.

  @@ -130,7 +130,7 @@

Returns

-

a GgitOId or NULL.

+

a GgitOId or NULL.

[transfer full]

diff -Nru libgit2-glib-0.23.10/docs/reference/html/GgitBranch.html libgit2-glib-0.24.0/docs/reference/html/GgitBranch.html --- libgit2-glib-0.23.10/docs/reference/html/GgitBranch.html 2016-02-05 16:21:09.000000000 +0000 +++ libgit2-glib-0.24.0/docs/reference/html/GgitBranch.html 2016-03-14 23:14:08.000000000 +0000 @@ -57,7 +57,7 @@ -const gchar * +const gchar * ggit_branch_get_name () @@ -73,7 +73,7 @@ -gboolean +gboolean ggit_branch_is_head () @@ -107,9 +107,9 @@

Object Hierarchy

-
    GEnum
+
    GEnum
     ╰── GgitBranchType
-    GObject
+    GObject
     ╰── GgitObjectFactoryBase
         ╰── GgitNative
             ╰── GgitRef
@@ -125,10 +125,10 @@
 
ggit_branch_delete ()

 
void
 ggit_branch_delete (GgitBranch *branch,
-                    GError **error);

+                    GError **error);

 
Deletes an existing branch reference.

 
If the branch is successfully deleted, this object is
-not useful anymore and if should be freed with g_object_unref().

+not useful anymore and if should be freed with g_object_unref().

 

 
Parameters

 

@@ -145,7 +145,7 @@
 
-
+
@@ -157,9 +157,9 @@
 
ggit_branch_move ()
GgitBranch *
 ggit_branch_move (GgitBranch *branch,
-                  const gchar *new_branch_name,
+                  const gchar *new_branch_name,
                   GgitCreateFlags flags,
-                  GError **error);

+                  GError **error);
Moves/renames an existing branch reference.

 
Parameters

@@ -187,7 +187,7 @@
 
 

-
+
@@ -202,9 +202,9 @@
 

 
ggit_branch_get_name ()

-
const gchar *
+
const gchar *
 ggit_branch_get_name (GgitBranch *branch,
-                      GError **error);

+                      GError **error);

 
Gets the name of the given local or remote branch.

 

 
Parameters

@@ -222,7 +222,7 @@
 
 

-
+
@@ -238,7 +238,7 @@
 
ggit_branch_get_upstream ()
GgitRef *
 ggit_branch_get_upstream (GgitBranch *branch,
-                          GError **error);

+                          GError **error);
Gets the reference supporting the remote tracking branch,
 given a local branch reference.

@@ -257,7 +257,7 @@
 
 

-
+
@@ -272,9 +272,9 @@
 

 
ggit_branch_is_head ()

-
gboolean
+
gboolean
 ggit_branch_is_head (GgitBranch *branch,
-                     GError **error);

+                     GError **error);

 
Determines if the current local branch is pointed at by HEAD.

 

 
Parameters

@@ -292,7 +292,7 @@
 
 

-
+
@@ -300,7 +300,7 @@
 

 
Returns

-
 TRUE if the current local branch is pointed at by HEAD.

+
 TRUE if the current local branch is pointed at by HEAD.

 

diff -Nru libgit2-glib-0.23.10/docs/reference/html/GgitCloneOptions.html libgit2-glib-0.24.0/docs/reference/html/GgitCloneOptions.html
--- libgit2-glib-0.23.10/docs/reference/html/GgitCloneOptions.html	2016-02-05 16:21:09.000000000 +0000
+++ libgit2-glib-0.24.0/docs/reference/html/GgitCloneOptions.html	2016-03-14 23:14:08.000000000 +0000
@@ -50,7 +50,7 @@
 
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

 

 
error
a GError for error reporting, or NULL.
a GError for error reporting, or NULL.

  
 

 
 
 
 

 
error
a GError for error reporting, or NULL.
a GError for error reporting, or NULL.

  
 

 
 

 
error
a GError for error reporting, or NULL.
a GError for error reporting, or NULL.

  
 

 
 
 
 

 
error
a GError for error reporting, or NULL.
a GError for error reporting, or NULL.

  
 

 
 

 
error
a GError for error reporting, or NULL.
a GError for error reporting, or NULL.

  
 

 
 
 
 
 

 
-gboolean
+gboolean
 
 
 ggit_clone_options_get_is_bare ()
@@ -65,7 +65,7 @@
 
 

 
const gchar *
+const gchar *
 
 
 ggit_clone_options_get_checkout_branch ()
@@ -79,6 +79,38 @@
 ggit_clone_options_set_checkout_branch ()
 
 

+GgitCloneLocal
+
+ggit_clone_options_get_local ()
+

+void
+
+ggit_clone_options_set_local ()
+

+GgitFetchOptions *
+
+ggit_clone_options_get_fetch_options ()
+

+void
+
+ggit_clone_options_set_fetch_options ()
+

 
 

 

@@ -97,7 +129,7 @@

Object Hierarchy

-
    GObject
+
    GObject
     ╰── GgitCloneOptions
@@ -119,7 +151,7 @@

ggit_clone_options_get_is_bare ()

-
gboolean
+
gboolean
 ggit_clone_options_get_is_bare (GgitCloneOptions *options);

 
Gets if the repository will be bare.

 

@@ -139,7 +171,7 @@
 

 

 
Returns

-
 TRUE to clone a bare repository.

+
 TRUE to clone a bare repository.
@@ -147,7 +179,7 @@

ggit_clone_options_set_is_bare ()

void
 ggit_clone_options_set_is_bare (GgitCloneOptions *options,
-                                gboolean bare);
+ gboolean bare);

Sets whether to clone a bare repository.

Parameters

@@ -165,7 +197,7 @@

bare

-

TRUE to clone a bare repository.

+

TRUE to clone a bare repository.

  @@ -175,10 +207,10 @@

ggit_clone_options_get_checkout_branch ()

-
const gchar *
+
const gchar *
 ggit_clone_options_get_checkout_branch
                                (GgitCloneOptions *options);

-
Gets the name of the branch to checkout or NULL.

+
Gets the name of the branch to checkout or NULL.

 

 
Parameters

 

@@ -196,7 +228,7 @@
 

 
Returns

-
 the name of the branch to checkout or NULL.

+
 the name of the branch to checkout or NULL.

 

@@ -205,8 +237,8 @@
 
void
 ggit_clone_options_set_checkout_branch
                                (GgitCloneOptions *options,
-                                const gchar *checkout_branch);

-
Gives the name of the branch to checkout. NULL means
+                                const gchar *checkout_branch);
+
Gives the name of the branch to checkout. NULL means
 use the remote's HEAD.

 
Parameters

@@ -224,7 +256,124 @@
 
 

-
+
+
+
+
+

 
 
 
 

 
checkout_branch
 the name of the branch to checkout or NULL. 
 the name of the branch to checkout or NULL. 
[allow-none]

+

+
+
+
+

ggit_clone_options_get_local ()

+
GgitCloneLocal
+ggit_clone_options_get_local (GgitCloneOptions *options);
+

Get setting for bypassing the git-aware transport when cloning. The +default auto setting bypasses the git-aware transport for local paths, +but use a normal fetch for file:// URIs.

+
+

Parameters

+
+++++ + + + + + +

options

a GgitCloneOptions.

 
+
+
+

Returns

+

the local clone setting.

+
+
+
+
+

ggit_clone_options_set_local ()

+
void
+ggit_clone_options_set_local (GgitCloneOptions *options,
+                              GgitCloneLocal local);
+

Set setting for bypassing the git-aware transport when cloning. The +default auto setting bypasses the git-aware transport for local paths, +but use a normal fetch for file:// URIs.

+
+

Parameters

+
+++++ + + + + + + + + + + + + +

options

a GgitCloneOptions.

 

local

the local clone setting.

 
+
+
+
+
+

ggit_clone_options_get_fetch_options ()

+
GgitFetchOptions *
+ggit_clone_options_get_fetch_options (GgitCloneOptions *options);
+

Get the fetch options object or NULL if not set.

+
+

Parameters

+
+++++ + + + + + +

options

a GgitCloneOptions.

 
+
+
+

Returns

+

the fetch options or NULL.

+

[transfer none]

+
+
+
+
+

ggit_clone_options_set_fetch_options ()

+
void
+ggit_clone_options_set_fetch_options (GgitCloneOptions *options,
+                                      GgitFetchOptions *fetch_options);
+

Set the fetch options object.

+
+

Parameters

+
+++++ + + + + + + + + + diff -Nru libgit2-glib-0.23.10/docs/reference/html/GgitCommit.html libgit2-glib-0.24.0/docs/reference/html/GgitCommit.html --- libgit2-glib-0.23.10/docs/reference/html/GgitCommit.html 2016-02-05 16:21:09.000000000 +0000 +++ libgit2-glib-0.24.0/docs/reference/html/GgitCommit.html 2016-03-14 23:14:08.000000000 +0000 @@ -7,7 +7,7 @@ - + @@ -22,7 +22,7 @@ - +

options

a GgitCloneOptions.

 

fetch_options

a GgitFetchOptions or NULL.

[allow-none]
Home Up PrevNextNext
@@ -42,21 +42,21 @@ -const gchar * +const gchar * ggit_commit_get_message_encoding () -const gchar * +const gchar * ggit_commit_get_message () -const gchar * +const gchar * ggit_commit_get_subject () @@ -88,22 +88,6 @@ -GgitCommit * - - -ggit_commit_parents_get () - - - - -GgitOId * - - -ggit_commit_parents_get_id () - - - - GgitTree * @@ -145,7 +129,7 @@ Read / Write / Construct Only -guint +guint size Read @@ -177,7 +161,7 @@

Object Hierarchy

-
    GObject
+
    GObject
     ├── GgitCommitParents
     ╰── GgitObjectFactoryBase
         ╰── GgitNative
@@ -192,11 +176,11 @@
 
Functions

 

 
ggit_commit_get_message_encoding ()

-
const gchar *
+
const gchar *
 ggit_commit_get_message_encoding (GgitCommit *commit);

 
Get the encoding for the message of a commit,
 as a string representing a standard encoding name.

-
The encoding may be NULL if the 'encoding' header
+
The encoding may be NULL if the 'encoding' header
 in the commit is missing; in that case UTF-8 is assumed.

 

 
Parameters

@@ -215,13 +199,13 @@
 

 

 
Returns

-
 the encoding of the commit message or NULL.

+
 the encoding of the commit message or NULL.

 

 

 

 

 
ggit_commit_get_message ()

-
const gchar *
+
const gchar *
 ggit_commit_get_message (GgitCommit *commit);

 
Gets the full message of commit
 . The resulting message is always encoded
@@ -249,7 +233,7 @@
 

 

 
ggit_commit_get_subject ()

-
const gchar *
+
const gchar *
 ggit_commit_get_subject (GgitCommit *commit);

 
Gets the subject of commit
 . The subject of a commit is the first line of
@@ -282,7 +266,7 @@
 ggit_commit_get_committer (GgitCommit *commit);

 
Gets the committer of commit
 . The returned value must be free'd with
-g_object_unref().

+g_object_unref().

 

 
Parameters

 

@@ -311,7 +295,7 @@
 ggit_commit_get_author (GgitCommit *commit);
Gets the author of commit
 . The returned value must be free'd with
-g_object_unref().

+g_object_unref().

 
Parameters

 

 
 

@@ -363,76 +347,6 @@
 

-
ggit_commit_parents_get ()

-
GgitCommit *
-ggit_commit_parents_get (GgitCommitParents *parents,
-                         guint idx);

-
Get the GgitCommit of a parent.

-

-
Parameters

-

 
 

-----
-
-
-
-
-
-
-
-
-
-
-
-
-





parents
a GgitCommitParents.
 
idx
the parent index.
 

-

-

-
Returns

-
 a GgitCommit. 

-
[transfer full]

-

-

-

-

-
ggit_commit_parents_get_id ()

-
GgitOId *
-ggit_commit_parents_get_id (GgitCommitParents *parents,
-                            guint idx);

-
Get the GgitOId of a parent.

-

-
Parameters

-

-----
-
-
-
-
-
-
-
-
-
-
-
-
-





parents
a GgitCommitParents.
 
idx
the parent index.
 

-

-

-
Returns

-
 a GgitOId. 

-
[transfer full]

-

-

-

-

 
ggit_commit_get_tree ()

 
GgitTree *
 ggit_commit_get_tree (GgitCommit *commit);

@@ -494,8 +408,8 @@
 
ggit_commit_get_nth_ancestor ()

 
GgitCommit *
 ggit_commit_get_nth_ancestor (GgitCommit *commit,
-                              guint n,
-                              GError **error);

+                              guint n,
+                              GError **error);

 
Gets the commit object that is the n-th generation ancestor
 of the named commit object, following only the first parents.
 Passing 0 to the n
@@ -522,7 +436,7 @@
 
 
 
error

-
a GError for error reporting, or NULL.

+
a GError for error reporting, or NULL.

  
 
 
@@ -580,7 +494,7 @@
 

 

 
The “size” property

-
  “size”                     guint

+
  “size”                     guint

 
The size of the parents collection.

 
Flags: Read

 
Default value: 0

diff -Nru libgit2-glib-0.23.10/docs/reference/html/GgitCommitParents.html libgit2-glib-0.24.0/docs/reference/html/GgitCommitParents.html
--- libgit2-glib-0.23.10/docs/reference/html/GgitCommitParents.html	1970-01-01 00:00:00.000000000 +0000
+++ libgit2-glib-0.24.0/docs/reference/html/GgitCommitParents.html	2016-03-14 23:14:08.000000000 +0000
@@ -0,0 +1,269 @@
+
+
+
+
+GgitCommitParents: libgit2-glib Reference Manual
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+

+

+
+
+

+
GgitCommitParents

+
GgitCommitParents

+

+

+
Functions

+

++++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+





+GgitCommitParents *
+
+ggit_commit_parents_new ()
+

+guint
+
+ggit_commit_parents_get_size ()
+

+GgitCommit *
+
+ggit_commit_parents_get ()
+

+GgitOId *
+
+ggit_commit_parents_get_id ()
+

+

+

+
Properties

+

+++++
+
+
+
+
+
+
+
+
+
+
+
+
+






+GgitCommit *commitRead / Write / Construct Only
guintsizeRead

+

+

+
Types and Values

+

++++
+
+
+
+
+
+
+
+
+
+
+




#defineGGIT_TYPE_COMMIT_PARENTS
 GgitCommitParents

+

+

+
Object Hierarchy

+
    GObject
+    ╰── GgitCommitParents
+

+

+

+
Description

+

+

+
Functions

+

+
ggit_commit_parents_new ()

+
GgitCommitParents *
+ggit_commit_parents_new (GgitCommit *commit);

+

+

+

+
ggit_commit_parents_get_size ()

+
guint
+ggit_commit_parents_get_size (GgitCommitParents *parents);

+
Get the number of parents in the parents collection.

+

+
Parameters

+

+++++
+
+
+
+
+
+





parents
a GgitCommitParents.
 

+

+

+
Returns

+
 the number of parents.

+

+

+

+

+
ggit_commit_parents_get ()

+
GgitCommit *
+ggit_commit_parents_get (GgitCommitParents *parents,
+                         guint idx);

+
Get the GgitCommit of a parent.

+

+
Parameters

+

+++++
+
+
+
+
+
+
+
+
+
+
+
+
+





parents
a GgitCommitParents.
 
idx
the parent index.
 

+

+

+
Returns

+
 a GgitCommit. 

+
[transfer full]

+

+

+

+

+
ggit_commit_parents_get_id ()

+
GgitOId *
+ggit_commit_parents_get_id (GgitCommitParents *parents,
+                            guint idx);

+
Get the GgitOId of a parent.

+

+
Parameters

+

+++++
+
+
+
+
+
+
+
+
+
+
+
+
+





parents
a GgitCommitParents.
 
idx
the parent index.
 

+

+

+
Returns

+
 a GgitOId. 

+
[transfer full]

+

+

+

+

+
Types and Values

+

+
GGIT_TYPE_COMMIT_PARENTS

+
#define GGIT_TYPE_COMMIT_PARENTS    (ggit_commit_parents_get_type ())
+

+

+

+

+
GgitCommitParents

+
typedef struct _GgitCommitParents GgitCommitParents;

+
Represents the parents of a commit object.

+

+

+

+
Property Details

+

+
The “commit” property

+
  “commit”                   GgitCommit *

+
The commit for the parents collection.

+
Flags: Read / Write / Construct Only

+

+

+

+
The “size” property

+
  “size”                     guint

+
The size of the parents collection.

+
Flags: Read

+
Default value: 0

+

+

+

+

+
Generated by GTK-Doc V1.24.1

+
+
\ No newline at end of file
diff -Nru libgit2-glib-0.23.10/docs/reference/html/GgitConfigEntry.html libgit2-glib-0.24.0/docs/reference/html/GgitConfigEntry.html
--- libgit2-glib-0.23.10/docs/reference/html/GgitConfigEntry.html	2016-02-05 16:21:09.000000000 +0000
+++ libgit2-glib-0.24.0/docs/reference/html/GgitConfigEntry.html	2016-03-14 23:14:08.000000000 +0000
@@ -57,14 +57,14 @@
 
 
 
-const gchar *
+const gchar *
 
 
 ggit_config_entry_get_name ()
 
 
 
-const gchar *
+const gchar *
 
 
 ggit_config_entry_get_value ()
@@ -96,7 +96,7 @@
 

 

 
Object Hierarchy

-
    GBoxed
+
    GBoxed
     ╰── GgitConfigEntry
 

 

@@ -161,7 +161,7 @@
 

 

 
ggit_config_entry_get_name ()

-
const gchar *
+
const gchar *
 ggit_config_entry_get_name (GgitConfigEntry *entry);

 
Gets the name of entry
 .

@@ -189,7 +189,7 @@
 

 

 
ggit_config_entry_get_value ()

-
const gchar *
+
const gchar *
 ggit_config_entry_get_value (GgitConfigEntry *entry);

 
Gets the value of entry
 .

diff -Nru libgit2-glib-0.23.10/docs/reference/html/GgitConfig.html libgit2-glib-0.24.0/docs/reference/html/GgitConfig.html
--- libgit2-glib-0.23.10/docs/reference/html/GgitConfig.html	2016-02-05 16:21:09.000000000 +0000
+++ libgit2-glib-0.24.0/docs/reference/html/GgitConfig.html	2016-03-14 23:14:08.000000000 +0000
@@ -6,7 +6,7 @@
 
 
 
-
+
 
 
 
@@ -20,7 +20,7 @@
 
 Home
 Up
-Prev
+Prev
 Next
 
 

@@ -42,7 +42,7 @@
 
 
 
-gint
+gint
 
 
 (*GgitConfigCallback) ()
@@ -50,7 +50,7 @@
 
 
 
-gint
+gint
 
 
 (*GgitConfigMatchCallback) ()
@@ -82,7 +82,7 @@
 
 
 
-GFile *
+GFile *
 
 
 ggit_config_find_global ()
@@ -90,7 +90,7 @@
 
 
 
-GFile *
+GFile *
 
 
 ggit_config_find_system ()
@@ -106,7 +106,7 @@
 
 
 
-gint32
+gint32
 
 
 ggit_config_get_int32 ()
@@ -114,7 +114,7 @@
 
 
 
-gboolean
+gboolean
 
 
 ggit_config_set_int32 ()
@@ -122,7 +122,7 @@
 
 
 
-gint64
+gint64
 
 
 ggit_config_get_int64 ()
@@ -130,7 +130,7 @@
 
 
 
-gboolean
+gboolean
 
 
 ggit_config_set_int64 ()
@@ -138,7 +138,7 @@
 
 
 
-gboolean
+gboolean
 
 
 ggit_config_get_bool ()
@@ -146,14 +146,14 @@
 
 
 
-gboolean
+gboolean
 
 
 ggit_config_set_bool ()
 
 
 
-const gchar *
+const gchar *
 
 
 ggit_config_get_string ()
@@ -161,7 +161,7 @@
 
 
 
-gboolean
+gboolean
 
 
 ggit_config_set_string ()
@@ -169,7 +169,7 @@
 
 
 
-gboolean
+gboolean
 
 
 ggit_config_delete_entry ()
@@ -177,7 +177,7 @@
 
 
 
-gboolean
+gboolean
 
 
 ggit_config_foreach ()
@@ -185,7 +185,7 @@
 
 
 
-gchar *
+gchar *
 
 
 ggit_config_match ()
@@ -193,7 +193,7 @@
 
 
 
-gboolean
+gboolean
 
 
 ggit_config_match_foreach ()
@@ -223,9 +223,9 @@
 

 

 
Object Hierarchy

-
    GEnum
+
    GEnum
     ╰── GgitConfigLevel
-    GObject
+    GObject
     ╰── GgitObjectFactoryBase
         ╰── GgitNative
             ╰── GgitConfig
@@ -238,9 +238,9 @@
 
Functions

 

 
GgitConfigCallback ()

-
gint
+
gint
 (*GgitConfigCallback) (GgitConfigEntry *entry,
-                       gpointer user_data);

+                       gpointer user_data);

 
The type of the callback functions for retrieving values from a GgitConfig.
 See ggit_config_foreach().

 

@@ -274,10 +274,10 @@
 

 

 
GgitConfigMatchCallback ()

-
gint
-(*GgitConfigMatchCallback) (GMatchInfo *match_info,
-                            const gchar *value,
-                            gpointer user_data);

+
gint
+(*GgitConfigMatchCallback) (GMatchInfo *match_info,
+                            const gchar *value,
+                            gpointer user_data);

 
The type of the callback functions for retrieving values from a GgitConfig
 using a regular expression. See ggit_config_match_foreach().

 

@@ -332,11 +332,11 @@
 

 
ggit_config_new_default ()

 
GgitConfig *
-ggit_config_new_default (GError **error);

+ggit_config_new_default (GError **error);

 
Get the global, XDG and system configuration files merged into one
 GgitConfig with their appropriate priority levels. If an error occured
 trying to load the various configuration files, this function will return
-NULL and error
+NULL and error
  will be set accordingly.

 

 
Parameters

@@ -348,7 +348,7 @@
 
 
 
error

-
a GError for error reporting, or NULL.

+
a GError for error reporting, or NULL.

  
 
 

@@ -363,13 +363,13 @@
 

 
ggit_config_new_from_file ()

 
GgitConfig *
-ggit_config_new_from_file (GFile *file,
-                           GError **error);

+ggit_config_new_from_file (GFile *file,
+                           GError **error);

 
Create a new config from a single on disk file. This is a convenience
 API and is exactly the same as creating an empty GgitConfig using
 ggit_config_new and adding the file with ggit_config_add_file. The
 level will be set to GGIT_CONFIG_LEVEL_LOCAL. If the config could not be
-loaded this function returns NULL and error
+loaded this function returns NULL and error
  will be set accordingly.

 

 
Parameters

@@ -387,7 +387,7 @@
 
 
 
error

-
a GError for error reporting, or NULL.

+
a GError for error reporting, or NULL.

  
 
 
@@ -402,33 +402,33 @@
 

 

 
ggit_config_find_global ()

-
GFile *
+
GFile *
 ggit_config_find_global (void);

 
Find the file representing the users global git configuration. This file
 is usually located at $HOME/.gitconfig. This function will try to guess
 the full path to that file, if the file exists. The returned file may then
 be used with ggit_config_new_from_file or ggit_config_add_file. This
-function returns NULL if the global config could not be found.

+function returns NULL if the global config could not be found.

 

 
Returns

-
 a GFile or NULL if the global config could not be found. 

+
 a GFile or NULL if the global config could not be found. 

 
[transfer full]

 

 

 

 

 
ggit_config_find_system ()

-
GFile *
+
GFile *
 ggit_config_find_system (void);

 
Find the file representing the systems global git configuration. This file
 is usually located at /etc/gitconfig on UNIX type systems or
 PROGRAMFILES%\Git\etc\gitconfig on windows. This function will try to guess
 the full path to that file, if the file exists. The returned file may then
 be used with ggit_config_new_from_file or ggit_config_add_file. This
-function returns NULL if the system config could not be found.

+function returns NULL if the system config could not be found.

 

 
Returns

-
 a GFile or NULL if the system config could not
+
 a GFile or NULL if the system config could not
 be found. 

 
[transfer full]

 

@@ -438,10 +438,10 @@
 
ggit_config_add_file ()

 
void
 ggit_config_add_file (GgitConfig *config,
-                      GFile *file,
+                      GFile *file,
                       GgitConfigLevel level,
-                      gboolean force,
-                      GError **error);

+                      gboolean force,
+                      GError **error);

 
Add an on-disk config file instance to an existing config

 
The on-disk file pointed at by file
  will be opened and
@@ -466,7 +466,7 @@
 
 
 
file

-
a GFile.

+
a GFile.

  
 
 
@@ -481,7 +481,7 @@
 
 
 
error

-
a GError for error reporting, or NULL.

+
a GError for error reporting, or NULL.

  
 
 
@@ -491,10 +491,10 @@
 

 

 
ggit_config_get_int32 ()

-
gint32
+
gint32
 ggit_config_get_int32 (GgitConfig *config,
-                       const gchar *name,
-                       GError **error);

+                       const gchar *name,
+                       GError **error);

 
Get a int32 configuration value.

 

 
Parameters

@@ -517,7 +517,7 @@
 
 
 
error

-
a GError for error reporting, or NULL.

+
a GError for error reporting, or NULL.

  
 
 
@@ -531,11 +531,11 @@
 

 

 
ggit_config_set_int32 ()

-
gboolean
+
gboolean
 ggit_config_set_int32 (GgitConfig *config,
-                       const gchar *name,
-                       gint32 value,
-                       GError **error);

+                       const gchar *name,
+                       gint32 value,
+                       GError **error);

 
Set a int32 value.

 

 
Parameters

@@ -563,7 +563,7 @@
 
 
 
error

-
a GError for error reporting, or NULL.

+
a GError for error reporting, or NULL.

  
 
 
@@ -571,16 +571,16 @@
 

 

 
Returns

-
 TRUE if the value was successfully set, FALSE otherwise.

+
 TRUE if the value was successfully set, FALSE otherwise.

 

 

 

 

 
ggit_config_get_int64 ()

-
gint64
+
gint64
 ggit_config_get_int64 (GgitConfig *config,
-                       const gchar *name,
-                       GError **error);

+                       const gchar *name,
+                       GError **error);

 
Get a int64 configuration value.

 

 
Parameters

@@ -603,7 +603,7 @@
 
 
 
error

-
a GError for error reporting, or NULL.

+
a GError for error reporting, or NULL.

  
 
 
@@ -617,11 +617,11 @@
 

 

 
ggit_config_set_int64 ()

-
gboolean
+
gboolean
 ggit_config_set_int64 (GgitConfig *config,
-                       const gchar *name,
-                       gint64 value,
-                       GError **error);

+                       const gchar *name,
+                       gint64 value,
+                       GError **error);

 
Set a int64 value.

 

 
Parameters

@@ -649,7 +649,7 @@
 
 
 
error

-
a GError for error reporting, or NULL.

+
a GError for error reporting, or NULL.

  
 
 
@@ -657,16 +657,16 @@
 

 

 
Returns

-
 TRUE if the value was successfully set, FALSE otherwise.

+
 TRUE if the value was successfully set, FALSE otherwise.

 

 

 

 

 
ggit_config_get_bool ()

-
gboolean
+
gboolean
 ggit_config_get_bool (GgitConfig *config,
-                      const gchar *name,
-                      GError **error);

+                      const gchar *name,
+                      GError **error);

 
Get a boolean configuration value.

 

 
Parameters

@@ -689,7 +689,7 @@
 
 
 
error

-
a GError for error reporting, or NULL.

+
a GError for error reporting, or NULL.

  
 
 
@@ -703,11 +703,11 @@
 

 

 
ggit_config_set_bool ()

-
gboolean
+
gboolean
 ggit_config_set_bool (GgitConfig *config,
-                      const gchar *name,
-                      gboolean value,
-                      GError **error);

+                      const gchar *name,
+                      gboolean value,
+                      GError **error);

 
Set a boolean value.

 

 
Parameters

@@ -735,7 +735,7 @@
 
 
 
error

-
a GError for error reporting, or NULL.

+
a GError for error reporting, or NULL.

  
 
 
@@ -743,16 +743,16 @@
 

 

 
Returns

-
 TRUE if the value was successfully set, FALSE otherwise.

+
 TRUE if the value was successfully set, FALSE otherwise.

 

 

 

 

 
ggit_config_get_string ()

-
const gchar *
+
const gchar *
 ggit_config_get_string (GgitConfig *config,
-                        const gchar *name,
-                        GError **error);

+                        const gchar *name,
+                        GError **error);

 
Get the configuration value of name
  as string.

 

@@ -776,7 +776,7 @@
 
 
 
error

-
a GError for error reporting, or NULL.

+
a GError for error reporting, or NULL.

  
 
 
@@ -785,7 +785,7 @@
 

 
Returns

 
 the string value of name
-, or NULL if such a value
+, or NULL if such a value
 does not exist. 

 
[allow-none]

 

@@ -793,11 +793,11 @@
 

 

 
ggit_config_set_string ()

-
gboolean
+
gboolean
 ggit_config_set_string (GgitConfig *config,
-                        const gchar *name,
-                        const gchar *value,
-                        GError **error);

+                        const gchar *name,
+                        const gchar *value,
+                        GError **error);

 
Set a new string value of a configuration.

 

 
Parameters

@@ -825,7 +825,7 @@
 
 
 
error

-
a GError for error reporting, or NULL.

+
a GError for error reporting, or NULL.

  
 
 
@@ -833,16 +833,16 @@
 

 

 
Returns

-
 TRUE if the value was successfully set, FALSE otherwise.

+
 TRUE if the value was successfully set, FALSE otherwise.

 

 

 

 

 
ggit_config_delete_entry ()

-
gboolean
+
gboolean
 ggit_config_delete_entry (GgitConfig *config,
-                          const gchar *name,
-                          GError **error);

+                          const gchar *name,
+                          GError **error);

 
Delete a config variable from the config file.

 

 
Parameters

@@ -865,7 +865,7 @@
 
 
 
error

-
a GError for error reporting, or NULL.

+
a GError for error reporting, or NULL.

  
 
 
@@ -873,17 +873,17 @@
 

 

 
Returns

-
 TRUE if the configuration value was deleted, FALSE otherwise.

+
 TRUE if the configuration value was deleted, FALSE otherwise.

 

 

 

 

 
ggit_config_foreach ()

-
gboolean
+
gboolean
 ggit_config_foreach (GgitConfig *config,
                      GgitConfigCallback callback,
-                     gpointer user_data,
-                     GError **error);

+                     gpointer user_data,
+                     GError **error);

 
Call callback
  for each configuration value.

 

@@ -913,7 +913,7 @@
 
 
 
error

-
a GError for error reporting, or NULL.

+
a GError for error reporting, or NULL.

  
 
 
@@ -921,20 +921,20 @@
 

 

 
Returns

-
 TRUE if successfull, FALSE otherwise

+
 TRUE if successfull, FALSE otherwise

 

 

 

 

 
ggit_config_match ()

-
gchar *
+
gchar *
 ggit_config_match (GgitConfig *config,
-                   GRegex *regex,
-                   GMatchInfo **match_info,
-                   GError **error);

+                   GRegex *regex,
+                   GMatchInfo **match_info,
+                   GError **error);

 
Matches a configuration against a regular expression. match_info
  will
-contain the match information if the return value is not NULL, otherwise
+contain the match information if the return value is not NULL, otherwise
 error
  will be set.

 

@@ -953,17 +953,17 @@
 
 
 
regex

-
a GRegex.

+
a GRegex.

  
 
 
 
match_info

-
 a GMatchInfo. 

+
 a GMatchInfo. 

 [out][allow-none]
 
 
 
error

-
a GError for error reporting, or NULL.

+
a GError for error reporting, or NULL.

  
 
 
@@ -978,12 +978,12 @@
 

 

 
ggit_config_match_foreach ()

-
gboolean
+
gboolean
 ggit_config_match_foreach (GgitConfig *config,
-                           GRegex *regex,
+                           GRegex *regex,
                            GgitConfigMatchCallback callback,
-                           gpointer user_data,
-                           GError **error);

+                           gpointer user_data,
+                           GError **error);

 
Call callback
  for all configurations matching regex
 .

@@ -1003,7 +1003,7 @@
 
 
 
regex

-
a GRegex.

+
a GRegex.

  
 
 
@@ -1019,7 +1019,7 @@
 
 
 
error

-
a GError for error reporting, or NULL.

+
a GError for error reporting, or NULL.

  
 
 
@@ -1027,7 +1027,7 @@
 

 

 
Returns

-
 TRUE if matches were successfull, FALSE otherwise

+
 TRUE if matches were successfull, FALSE otherwise

 

 

 

@@ -1054,6 +1054,13 @@
 
 
 
+
GGIT_CONFIG_LEVEL_PROGRAMDATA

+
+
System-wide on Windows, for compatibility with portable git.

+
+ 
+
+
 
GGIT_CONFIG_LEVEL_SYSTEM

 
 
System-wide configuration file.

@@ -1081,6 +1088,13 @@
 
  
 
+
+
GGIT_CONFIG_LEVEL_APP

+
+
Application specific configuration file; freely defined by applications.

+
+ 
+
 
 
GGIT_CONFIG_LEVEL_HIGHEST

 
diff -Nru libgit2-glib-0.23.10/docs/reference/html/GgitCred.html libgit2-glib-0.24.0/docs/reference/html/GgitCred.html
--- libgit2-glib-0.23.10/docs/reference/html/GgitCred.html	2016-02-05 16:21:09.000000000 +0000
+++ libgit2-glib-0.24.0/docs/reference/html/GgitCred.html	2016-03-14 23:14:08.000000000 +0000
@@ -41,7 +41,7 @@
 
 
 
-gint
+gint
 
 
 (*GgitCredAcquireCallback) ()
@@ -70,7 +70,7 @@
 

 

 
Object Hierarchy

-
    GObject
+
    GObject
     ╰── GgitObjectFactoryBase
         ╰── GgitNative
             ╰── GgitCred
@@ -84,12 +84,12 @@
 
Functions

 

 
GgitCredAcquireCallback ()

-
gint
-(*GgitCredAcquireCallback) (const gchar *url,
-                            const gchar *username_from_url,
-                            guint allowed_types,
+
gint
+(*GgitCredAcquireCallback) (const gchar *url,
+                            const gchar *username_from_url,
+                            guint allowed_types,
                             GgitCred **cred,
-                            gpointer user_data);

+                            gpointer user_data);

 
Signature of a function which acquires a credential object.

 

 
Parameters

diff -Nru libgit2-glib-0.23.10/docs/reference/html/GgitCredPlaintext.html libgit2-glib-0.24.0/docs/reference/html/GgitCredPlaintext.html
--- libgit2-glib-0.23.10/docs/reference/html/GgitCredPlaintext.html	2016-02-05 16:21:09.000000000 +0000
+++ libgit2-glib-0.24.0/docs/reference/html/GgitCredPlaintext.html	2016-03-14 23:14:08.000000000 +0000
@@ -51,14 +51,14 @@
 
 
 
-const gchar *
+const gchar *
 
 
 ggit_cred_plaintext_get_username ()
 
 
 
-const gchar *
+const gchar *
 
 
 ggit_cred_plaintext_get_password ()
@@ -78,13 +78,13 @@
 
 
 
-gchar *
+gchar *
 password
 Read / Write / Construct Only
 
 
 
-gchar *
+gchar *
 username
 Read / Write / Construct Only
 
@@ -112,7 +112,7 @@
 

 

 
Object Hierarchy

-
    GObject
+
    GObject
     ╰── GgitObjectFactoryBase
         ╰── GgitNative
             ╰── GgitCred
@@ -123,7 +123,7 @@
 
Implemented Interfaces

 

 GgitCredPlaintext implements
- GInitable.

+ GInitable.

 

 

 
Description

@@ -133,20 +133,20 @@
 

 
ggit_cred_plaintext_new ()

 
GgitCredPlaintext *
-ggit_cred_plaintext_new (const gchar *username,
-                         const gchar *password,
-                         GError **error);

+ggit_cred_plaintext_new (const gchar *username,
+                         const gchar *password,
+                         GError **error);

 

 

 

 
ggit_cred_plaintext_get_username ()

-
const gchar *
+
const gchar *
 ggit_cred_plaintext_get_username (GgitCredPlaintext *cred);

 

 

 

 
ggit_cred_plaintext_get_password ()

-
const gchar *
+
const gchar *
 ggit_cred_plaintext_get_password (GgitCredPlaintext *cred);

 

 

@@ -169,7 +169,7 @@
 
Property Details

 

 
The “password” property

-
  “password”                 gchar *

+
  “password”                 gchar *

 
The password.

 
Flags: Read / Write / Construct Only

 
Default value: NULL

@@ -177,7 +177,7 @@
 

 

 
The “username” property

-
  “username”                 gchar *

+
  “username”                 gchar *

 
The user name.

 
Flags: Read / Write / Construct Only

 
Default value: NULL

diff -Nru libgit2-glib-0.23.10/docs/reference/html/GgitDiffDelta.html libgit2-glib-0.24.0/docs/reference/html/GgitDiffDelta.html
--- libgit2-glib-0.23.10/docs/reference/html/GgitDiffDelta.html	2016-02-05 16:21:09.000000000 +0000
+++ libgit2-glib-0.24.0/docs/reference/html/GgitDiffDelta.html	2016-03-14 23:14:08.000000000 +0000
@@ -82,7 +82,7 @@
 
 
 
-guint
+guint
 
 
 ggit_diff_delta_get_similarity ()
@@ -120,9 +120,9 @@
 

 

 
Object Hierarchy

-
    GBoxed
+
    GBoxed
     ╰── GgitDiffDelta
-    GEnum
+    GEnum
     ╰── GgitDeltaType
 

 

@@ -269,7 +269,7 @@
 

 

 
ggit_diff_delta_get_similarity ()

-
guint
+
guint
 ggit_diff_delta_get_similarity (GgitDiffDelta *delta);

 
Gets the similarity between delta
  files.

diff -Nru libgit2-glib-0.23.10/docs/reference/html/GgitDiffFile.html libgit2-glib-0.24.0/docs/reference/html/GgitDiffFile.html
--- libgit2-glib-0.23.10/docs/reference/html/GgitDiffFile.html	2016-02-05 16:21:09.000000000 +0000
+++ libgit2-glib-0.24.0/docs/reference/html/GgitDiffFile.html	2016-03-14 23:14:08.000000000 +0000
@@ -65,7 +65,7 @@
 
 
 
-const gchar *
+const gchar *
 
 
 ggit_diff_file_get_path ()
@@ -73,7 +73,7 @@
 
 
 
-guint16
+guint16
 
 
 ggit_diff_file_get_mode ()
@@ -81,7 +81,7 @@
 
 
 
-gint64
+gint64
 
 
 ggit_diff_file_get_size ()
@@ -113,7 +113,7 @@
 

 

 
Object Hierarchy

-
    GBoxed
+
    GBoxed
     ╰── GgitDiffFile
 

 

@@ -205,10 +205,10 @@
 

 

 
ggit_diff_file_get_path ()

-
const gchar *
+
const gchar *
 ggit_diff_file_get_path (GgitDiffFile *file);

 
Gets the path of file
- or NULL if it is unknown.

+ or NULL if it is unknown.

 

 
Parameters

 

@@ -226,14 +226,14 @@
 

 
Returns

-
 the file's path, or NULL. 

+
 the file's path, or NULL. 

 
[allow-none]

 

 
ggit_diff_file_get_mode ()

-
guint16
+
guint16
 ggit_diff_file_get_mode (GgitDiffFile *file);

 
Gets the mode for file
 .

@@ -260,7 +260,7 @@
 

 

 
ggit_diff_file_get_size ()

-
gint64
+
gint64
 ggit_diff_file_get_size (GgitDiffFile *file);

 
Gets the size for file
 .

diff -Nru libgit2-glib-0.23.10/docs/reference/html/GgitDiff.html libgit2-glib-0.24.0/docs/reference/html/GgitDiff.html
--- libgit2-glib-0.23.10/docs/reference/html/GgitDiff.html	2016-02-05 16:21:09.000000000 +0000
+++ libgit2-glib-0.24.0/docs/reference/html/GgitDiff.html	2016-03-14 23:14:08.000000000 +0000
@@ -43,7 +43,7 @@
 

-
+
-
+
@@ -389,7 +389,7 @@
 

 
Returns

-
 a newly allocated GgitDiff if there was no error, NULL otherwise.

+
 a newly allocated GgitDiff if there was no error, NULL otherwise.

 

@@ -400,14 +400,14 @@
                              GgitTree *old_tree,
                              GgitIndex *index,
                              GgitDiffOptions *diff_options,
-                             GError **error);
+                             GError **error);
Creates a GgitDiff which compares old_tree
  and the index.
If index
- is NULL then repository
+ is NULL then repository
  index is used.
 If diff_options
- is NULL then the defaults specified in
+ is NULL then the defaults specified in
 ggit_diff_options_new() are used.

 
Parameters

@@ -430,17 +430,17 @@
 
 

-
+
-
+
-
+
@@ -448,7 +448,7 @@
 

 
Returns

-
 a newly allocated GgitDiff if there was no error, NULL otherwise.

+
 a newly allocated GgitDiff if there was no error, NULL otherwise.

 

@@ -458,13 +458,13 @@
 ggit_diff_new_index_to_workdir (GgitRepository *repository,
                                 GgitIndex *index,
                                 GgitDiffOptions *diff_options,
-                                GError **error);
+                                GError **error);
Creates a GgitDiff which compares the working directory and the index.
If index
- is NULL then repository
+ is NULL then repository
  index is used.
 If diff_options
- is NULL then the defaults specified in
+ is NULL then the defaults specified in
 ggit_diff_options_new() are used.

 
Parameters

@@ -482,17 +482,17 @@
 
 

-
+
-
+
-
+
@@ -500,7 +500,7 @@
 

 
Returns

-
 a newly allocated GgitDiff if there was no error, NULL otherwise.

+
 a newly allocated GgitDiff if there was no error, NULL otherwise.

 

@@ -510,11 +510,11 @@
 ggit_diff_new_tree_to_workdir (GgitRepository *repository,
                                GgitTree *old_tree,
                                GgitDiffOptions *diff_options,
-                               GError **error);
+                               GError **error);
Creates a GgitDiff which compares the working directory and old_tree
 .
If diff_options
- is NULL then the defaults specified in
+ is NULL then the defaults specified in
 ggit_diff_options_new() are used.

 
Parameters

@@ -537,12 +537,12 @@
 
 

-
+
-
+
@@ -550,7 +550,7 @@
 

 
Returns

-
 a newly allocated GgitDiff if there was no error, NULL otherwise.

+
 a newly allocated GgitDiff if there was no error, NULL otherwise.

 

@@ -559,7 +559,7 @@
 
void
 ggit_diff_merge (GgitDiff *onto,
                  GgitDiff *from,
-                 GError **error);

+                 GError **error);
Merges from
  into onto
  unless error
@@ -585,7 +585,7 @@
 
 

-
+
@@ -601,8 +601,8 @@
                    GgitDiffBinaryCallback binary_cb,
                    GgitDiffHunkCallback hunk_cb,
                    GgitDiffLineCallback line_cb,
-                   gpointer *user_data,
-                   GError **error);
+                   gpointer *user_data,
+                   GError **error);
Iterates over the diff calling file_cb
 , binary_cb
 , hunk_cb
@@ -649,7 +649,7 @@
 
 

-
+
@@ -663,8 +663,8 @@
 ggit_diff_print (GgitDiff *diff,
                  GgitDiffFormatType type,
                  GgitDiffLineCallback print_cb,
-                 gpointer *user_data,
-                 GError **error);
+                 gpointer *user_data,
+                 GError **error);
Iterates over diff
  generating text output like "git diff".

@@ -698,7 +698,7 @@
 
 

-
+
@@ -710,25 +710,25 @@
 
ggit_diff_blobs ()
void
 ggit_diff_blobs (GgitBlob *old_blob,
-                 const gchar *old_as_path,
+                 const gchar *old_as_path,
                  GgitBlob *new_blob,
-                 const gchar *new_as_path,
+                 const gchar *new_as_path,
                  GgitDiffOptions *diff_options,
                  GgitDiffFileCallback file_cb,
                  GgitDiffBinaryCallback binary_cb,
                  GgitDiffHunkCallback hunk_cb,
                  GgitDiffLineCallback line_cb,
-                 gpointer *user_data,
-                 GError **error);

+                 gpointer *user_data,
+                 GError **error);
Iterates over the diff calling file_cb
 , binary_cb
 , hunk_cb
  and line_cb
 .

-
The GgitDiffFile mode always be 0, path will be NULL and when a blob is
-NULL the oid will be 0.

+
The GgitDiffFile mode always be 0, path will be NULL and when a blob is
+NULL the oid will be 0.
If diff_options
- is NULL then the defaults specified in
+ is NULL then the defaults specified in
 ggit_diff_options_new() are used.

 
Parameters

@@ -747,7 +747,7 @@
 

+as if it had this filename, or NULL,. 

@@ -758,12 +758,12 @@
 
+as if it had this filename, or NULL,. 

-
+
@@ -793,7 +793,7 @@
 
-
+
@@ -805,17 +805,17 @@
 
ggit_diff_blob_to_buffer ()
void
 ggit_diff_blob_to_buffer (GgitBlob *old_blob,
-                          const gchar *old_as_path,
-                          const guint8 *buffer,
-                          gssize buffer_len,
-                          const gchar *buffer_as_path,
+                          const gchar *old_as_path,
+                          const guint8 *buffer,
+                          gssize buffer_len,
+                          const gchar *buffer_as_path,
                           GgitDiffOptions *diff_options,
                           GgitDiffFileCallback file_cb,
                           GgitDiffBinaryCallback binary_cb,
                           GgitDiffHunkCallback hunk_cb,
                           GgitDiffLineCallback line_cb,
-                          gpointer user_data,
-                          GError **error);

+                          gpointer user_data,
+                          GError **error);
Same as ggit_diff_blobs() but using a buffer.

 
Parameters

@@ -834,7 +834,7 @@
 

+as if it had this filename, or NULL,. 

@@ -851,12 +851,12 @@
 
+as if it had this filename, or NULL,. 

-
+
@@ -886,7 +886,7 @@
 
-
+
diff -Nru libgit2-glib-0.23.10/docs/reference/html/GgitDiffHunk.html libgit2-glib-0.24.0/docs/reference/html/GgitDiffHunk.html
--- libgit2-glib-0.23.10/docs/reference/html/GgitDiffHunk.html	2016-02-05 16:21:09.000000000 +0000
+++ libgit2-glib-0.24.0/docs/reference/html/GgitDiffHunk.html	2016-03-14 23:14:08.000000000 +0000
@@ -41,7 +41,7 @@
 
-
-
-
-
-
-
-
-
-
-
-
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

 
 
 
 
 

 
-gint
+gint
 
 
 (*GgitDiffFileCallback) ()
@@ -51,7 +51,7 @@
 

 

 
-gint
+gint
 
 
 (*GgitDiffHunkCallback) ()
@@ -59,7 +59,7 @@
 

 

 
-gint
+gint
 
 
 (*GgitDiffLineCallback) ()
@@ -193,13 +193,13 @@
 
 

 
Object Hierarchy

-
    GEnum
+
    GEnum
     ├── GgitDiffFormatType
     ╰── GgitDiffLineType
-    GFlags
+    GFlags
     ├── GgitDiffFlag
     ╰── GgitDiffOption
-    GObject
+    GObject
     ╰── GgitObjectFactoryBase
         ╰── GgitNative
             ╰── GgitDiff
@@ -212,10 +212,10 @@
 
Functions

 

 
GgitDiffFileCallback ()

-
gint
+
gint
 (*GgitDiffFileCallback) (GgitDiffDelta *delta,
-                         gfloat progress,
-                         gpointer user_data);

+                         gfloat progress,
+                         gpointer user_data);

 
Called for each file.

 

 
Parameters

@@ -252,10 +252,10 @@
 

 

 
GgitDiffHunkCallback ()

-
gint
+
gint
 (*GgitDiffHunkCallback) (GgitDiffDelta *delta,
                          GgitDiffHunk *hunk,
-                         gpointer user_data);

+                         gpointer user_data);

 
Called for each hunk.

 

 
Parameters

@@ -292,11 +292,11 @@
 

 

 
GgitDiffLineCallback ()

-
gint
+
gint
 (*GgitDiffLineCallback) (GgitDiffDelta *delta,
                          GgitDiffHunk *hunk,
                          GgitDiffLine *line,
-                         gpointer user_data);

+                         gpointer user_data);

 
Called for each line.

 

 
Parameters

@@ -343,12 +343,12 @@
                             GgitTree *old_tree,
                             GgitTree *new_tree,
                             GgitDiffOptions *diff_options,
-                            GError **error);

+                            GError **error);

 
Creates a GgitDiff which compares old_tree
  and new_tree
 .

 
If diff_options
- is NULL then the defaults specified in
+ is NULL then the defaults specified in
 ggit_diff_options_new() are used.

 

 
Parameters

@@ -376,12 +376,12 @@
 

 

 
diff_options
 a GgitDiffOptions, or NULL. 
 a GgitDiffOptions, or NULL. 

 [allow-none]
 

 

 
error
a GError for error reporting, or NULL.
a GError for error reporting, or NULL.

  
 

 
 
 
 
 
 
 

 
index
 a GgitIndex, or NULL. 
 a GgitIndex, or NULL. 

 [allow-none]
 

 

 
diff_options
 a GgitDiffOptions, or NULL. 
 a GgitDiffOptions, or NULL. 

 [allow-none]
 

 

 
error
a GError for error reporting, or NULL.
a GError for error reporting, or NULL.

  
 

 
 
 
 
 
 
 

 
index
 a GgitIndex, or NULL. 
 a GgitIndex, or NULL. 

 [allow-none]
 

 

 
diff_options
 a GgitDiffOptions, or NULL. 
 a GgitDiffOptions, or NULL. 

 [allow-none]
 

 

 
error
a GError for error reporting, or NULL.
a GError for error reporting, or NULL.

  
 

 
 
 
 
 
 
 

 
diff_options
 a GgitDiffOptions, or NULL. 
 a GgitDiffOptions, or NULL. 

 [allow-none]
 

 

 
error
a GError for error reporting, or NULL.
a GError for error reporting, or NULL.

  
 

 
 
 
 
 

 
error
a GError for error reporting, or NULL.
a GError for error reporting, or NULL.

  
 

 
 

 
error
a GError for error reporting, or NULL.
a GError for error reporting, or NULL.

  
 

 
 
 

 
error
a GError for error reporting, or NULL.
a GError for error reporting, or NULL.

  
 

 
 
 
 
 

 
old_as_path

 
 treat old_blob
-as if it had this filename, or NULL,. 

 [allow-none]
 

 

 
new_as_path

 
 treat new_blob
-as if it had this filename, or NULL,. 

 [allow-none]
 

 

 
diff_options
 a GgitDiffOptions, or NULL. 
 a GgitDiffOptions, or NULL. 

 [allow-none]
 

 

 

 
error
a GError for error reporting, or NULL.
a GError for error reporting, or NULL.

  
 

 
 
 
 

 
old_as_path

 
 treat old_blob
-as if it had this filename, or NULL,. 

 [allow-none]
 

 

 
buffer_as_path

 
 treat buffer
-as if it had this filename, or NULL,. 

 [allow-none]
 

 

 
diff_options
 a GgitDiffOptions, or NULL. 
 a GgitDiffOptions, or NULL. 

 [allow-none]
 

 

 

 
error
a GError for error reporting, or NULL.
a GError for error reporting, or NULL.

  
 

 
 
 
const gchar *
+const gchar *
 
 
 ggit_diff_hunk_get_header ()
@@ -49,7 +49,7 @@
 

 

 
-gint
+gint
 
 
 ggit_diff_hunk_get_new_lines ()
@@ -57,7 +57,7 @@
 

 

 
-gint
+gint
 
 
 ggit_diff_hunk_get_new_start ()
@@ -65,7 +65,7 @@
 

 

 
-gint
+gint
 
 
 ggit_diff_hunk_get_old_lines ()
@@ -73,7 +73,7 @@
 

 

 
-gint
+gint
 
 
 ggit_diff_hunk_get_old_start ()
@@ -81,14 +81,6 @@
 

 

 
-GType
-
-ggit_diff_hunk_get_type ()
-

 GgitDiffHunk *
 
 
@@ -121,7 +113,7 @@
 
 

 
Object Hierarchy

-
    GBoxed
+
    GBoxed
     ╰── GgitDiffHunk
 

 

@@ -132,13 +124,13 @@
 
Functions

 

 
ggit_diff_hunk_get_header ()

-
const gchar *
+
const gchar *
 ggit_diff_hunk_get_header (GgitDiffHunk *hunk);

 

 

 

 
ggit_diff_hunk_get_new_lines ()

-
gint
+
gint
 ggit_diff_hunk_get_new_lines (GgitDiffHunk *hunk);

 
Gets the number of lines in the new file.

 

@@ -164,7 +156,7 @@
 

 

 
ggit_diff_hunk_get_new_start ()

-
gint
+
gint
 ggit_diff_hunk_get_new_start (GgitDiffHunk *hunk);

 
Gets the starting line number in the new file.

 

@@ -190,7 +182,7 @@
 

 

 
ggit_diff_hunk_get_old_lines ()

-
gint
+
gint
 ggit_diff_hunk_get_old_lines (GgitDiffHunk *hunk);

 
Gets the number of lines in the old file.

 

@@ -216,7 +208,7 @@
 

 

 
ggit_diff_hunk_get_old_start ()

-
gint
+
gint
 ggit_diff_hunk_get_old_start (GgitDiffHunk *hunk);

 
Gets the starting line number in the old file.

 

@@ -241,12 +233,6 @@
 

 

 

-
ggit_diff_hunk_get_type ()

-
GType
-ggit_diff_hunk_get_type (void);

-

-

-

 
ggit_diff_hunk_ref ()

 
GgitDiffHunk *
 ggit_diff_hunk_ref (GgitDiffHunk *hunk);

diff -Nru libgit2-glib-0.23.10/docs/reference/html/GgitDiffLine.html libgit2-glib-0.24.0/docs/reference/html/GgitDiffLine.html
--- libgit2-glib-0.23.10/docs/reference/html/GgitDiffLine.html	2016-02-05 16:21:09.000000000 +0000
+++ libgit2-glib-0.24.0/docs/reference/html/GgitDiffLine.html	2016-03-14 23:14:08.000000000 +0000
@@ -41,7 +41,7 @@
 
 

 
const guint8 *
+const guint8 *
 
 
 ggit_diff_line_get_content ()
@@ -49,7 +49,7 @@
 

 

 
-gint64
+gint64
 
 
 ggit_diff_line_get_content_offset ()
@@ -57,7 +57,7 @@
 

 

 
-gint
+gint
 
 
 ggit_diff_line_get_new_lineno ()
@@ -65,7 +65,7 @@
 

 

 
-gint
+gint
 
 
 ggit_diff_line_get_old_lineno ()
@@ -81,14 +81,6 @@
 

 

 
-GType
-
-ggit_diff_line_get_type ()
-

 GgitDiffLine *
 
 
@@ -121,7 +113,7 @@
 
 

 
Object Hierarchy

-
    GBoxed
+
    GBoxed
     ╰── GgitDiffLine
 

 

@@ -132,9 +124,9 @@
 
Functions

 

 
ggit_diff_line_get_content ()

-
const guint8 *
+
const guint8 *
 ggit_diff_line_get_content (GgitDiffLine *line,
-                            gsize *length);

+                            gsize *length);

 
Gets the content in bytes.

 

 
Parameters

@@ -167,7 +159,7 @@
 

 

 
ggit_diff_line_get_content_offset ()

-
gint64
+
gint64
 ggit_diff_line_get_content_offset (GgitDiffLine *line);

 
Gets the content offset.

 

@@ -193,7 +185,7 @@
 

 

 
ggit_diff_line_get_new_lineno ()

-
gint
+
gint
 ggit_diff_line_get_new_lineno (GgitDiffLine *line);

 
Gets the Line number in new file or -1 for deleted line.

 

@@ -219,7 +211,7 @@
 

 

 
ggit_diff_line_get_old_lineno ()

-
gint
+
gint
 ggit_diff_line_get_old_lineno (GgitDiffLine *line);

 
Gets the line number in old file or -1 for added line.

 

@@ -270,12 +262,6 @@
 

 

 

-
ggit_diff_line_get_type ()

-
GType
-ggit_diff_line_get_type (void);

-

-

-

 
ggit_diff_line_ref ()

 
GgitDiffLine *
 ggit_diff_line_ref (GgitDiffLine *line);

diff -Nru libgit2-glib-0.23.10/docs/reference/html/GgitDiffOptions.html libgit2-glib-0.24.0/docs/reference/html/GgitDiffOptions.html
--- libgit2-glib-0.23.10/docs/reference/html/GgitDiffOptions.html	2016-02-05 16:21:09.000000000 +0000
+++ libgit2-glib-0.24.0/docs/reference/html/GgitDiffOptions.html	2016-03-14 23:14:08.000000000 +0000
@@ -40,14 +40,109 @@
 

 
 

 
 GgitDiffOptions *
 
 
 ggit_diff_options_new ()
 

+GgitDiffOption
+
+ggit_diff_options_get_flags ()
+

+void
+
+ggit_diff_options_set_flags ()
+

+gint
+
+ggit_diff_options_get_n_context_lines ()
+

+void
+
+ggit_diff_options_set_n_context_lines ()
+

+gint
+
+ggit_diff_options_get_n_interhunk_lines ()
+

+void
+
+ggit_diff_options_set_n_interhunk_lines ()
+
const gchar *
+
+ggit_diff_options_get_old_prefix ()
+

+void
+
+ggit_diff_options_set_old_prefix ()
+
const gchar *
+
+ggit_diff_options_get_new_prefix ()
+

+void
+
+ggit_diff_options_set_new_prefix ()
+
const gchar **
+
+ggit_diff_options_get_pathspec ()
+

+void
+
+ggit_diff_options_set_pathspec ()
+

 

 

 

@@ -65,29 +160,29 @@
 Read / Write / Construct
 
 
-gint
+gint
 n-context-lines
 Read / Write / Construct
 
 
-gint
+gint
 n-interhunk-lines
 Read / Write / Construct
 
 
 
-gchar *
+gchar *
 new-prefix
 Read / Write / Construct
 
 
 
-gchar *
+gchar *
 old-prefix
 Read / Write / Construct
 
 
-GStrv
+GStrv
 pathspec
 Read / Write / Construct
 
@@ -101,15 +196,21 @@
 
 
 
-
+
+
  
 GgitDiffOptions
-
+
+
+struct
+GgitDiffOptionsClass
+
+
 

 

 

 
Object Hierarchy

-
    GObject
+
    GObject
     ╰── GgitDiffOptions
 

 

@@ -128,6 +229,345 @@
 
 a GgitDiffOptions.

 

 

+

+

+
ggit_diff_options_get_flags ()

+
GgitDiffOption
+ggit_diff_options_get_flags (GgitDiffOptions *options);

+
Get the diff flags.

+

+
Parameters

+

+++++
+
+
+
+
+
+





options
a GgitDiffOptions.
 

+

+

+
Returns

+
 a GgitDiffOption.

+

+

+

+

+
ggit_diff_options_set_flags ()

+
void
+ggit_diff_options_set_flags (GgitDiffOptions *options,
+                             GgitDiffOption flags);

+
Set the diff flags.

+

+
Parameters

+

+++++
+
+
+
+
+
+
+
+
+
+
+
+
+





options
a GgitDiffOptions.
 
flags
a GgitDiffOption.
 

+

+

+

+

+
ggit_diff_options_get_n_context_lines ()

+
gint
+ggit_diff_options_get_n_context_lines (GgitDiffOptions *options);

+
Get the number of context lines to include in the diff.

+

+
Parameters

+

+++++
+
+
+
+
+
+





options
a GgitDiffOptions.
 

+

+

+
Returns

+
 the number of context lines.

+

+

+

+

+
ggit_diff_options_set_n_context_lines ()

+
void
+ggit_diff_options_set_n_context_lines (GgitDiffOptions *options,
+                                       gint n);

+
Set the number of context lines to include in the diff.

+

+
Parameters

+

+++++
+
+
+
+
+
+
+
+
+
+
+
+
+





options
a GgitDiffOptions.
 
n
the number of lines.
 

+

+

+

+

+
ggit_diff_options_get_n_interhunk_lines ()

+
gint
+ggit_diff_options_get_n_interhunk_lines
+                               (GgitDiffOptions *options);

+
Get the number of interhunk lines to include in the diff.

+

+
Parameters

+

+++++
+
+
+
+
+
+





options
a GgitDiffOptions.
 

+

+

+
Returns

+
 the number of lines.

+

+

+

+

+
ggit_diff_options_set_n_interhunk_lines ()

+
void
+ggit_diff_options_set_n_interhunk_lines
+                               (GgitDiffOptions *options,
+                                gint n);

+
Set the number of interhunk lines to include in the diff.

+

+
Parameters

+

+++++
+
+
+
+
+
+
+
+
+
+
+
+
+





options
a GgitDiffOptions.
 
n
the number of lines.
 

+

+

+

+

+
ggit_diff_options_get_old_prefix ()

+
const gchar *
+ggit_diff_options_get_old_prefix (GgitDiffOptions *options);

+
Get the diff old-prefix string.

+

+
Parameters

+

+++++
+
+
+
+
+
+





options
a GgitDiffOptions.
 

+

+

+
Returns

+
 the old-prefix string.

+

+

+

+

+
ggit_diff_options_set_old_prefix ()

+
void
+ggit_diff_options_set_old_prefix (GgitDiffOptions *options,
+                                  const gchar *prefix);

+
Get the diff old-prefix string.

+

+
Parameters

+

+++++
+
+
+
+
+
+
+
+
+
+
+
+
+





options
a GgitDiffOptions.
 
prefix
the prefix.
 

+

+

+

+

+
ggit_diff_options_get_new_prefix ()

+
const gchar *
+ggit_diff_options_get_new_prefix (GgitDiffOptions *options);

+
Get the diff new-prefix string.

+

+
Parameters

+

+++++
+
+
+
+
+
+





options
a GgitDiffOptions.
 

+

+

+
Returns

+
 the new-prefix string.

+

+

+

+

+
ggit_diff_options_set_new_prefix ()

+
void
+ggit_diff_options_set_new_prefix (GgitDiffOptions *options,
+                                  const gchar *prefix);

+
Set the diff new-prefix string.

+

+
Parameters

+

+++++
+
+
+
+
+
+
+
+
+
+
+
+
+





options
a GgitDiffOptions.
 
prefix
the prefix.
 

+

+

+

+

+
ggit_diff_options_get_pathspec ()

+
const gchar **
+ggit_diff_options_get_pathspec (GgitDiffOptions *options);

+
Get the pathspec.

+

+
Parameters

+

+++++
+
+
+
+
+
+





options
a GgitDiffOptions.
 

+

+

+
Returns

+
 the pathspec. 

+
[transfer none][array zero-terminated=1]

+

+

+

+

+
ggit_diff_options_set_pathspec ()

+
void
+ggit_diff_options_set_pathspec (GgitDiffOptions *options,
+                                const gchar **pathspec);

+
Set the pathspec.

+

+
Parameters

+

+++++
+
+
+
+
+
+
+
+
+
+
+
+
+





options
a GgitDiffOptions.
 
pathspec
 the pathspec. 
[array zero-terminated=1][allow-none]

+

+

 

 

 
Types and Values

@@ -136,6 +576,14 @@
 
typedef struct _GgitDiffOptions GgitDiffOptions;

 
Represents the options used when creating a GgitDiff.

 

+

+

+
struct GgitDiffOptionsClass

+
struct GgitDiffOptionsClass {
+	GObjectClass parent_class;
+};
+

+

 

 

 
Property Details

@@ -148,7 +596,7 @@
 

 

 
The “n-context-lines” property

-
  “n-context-lines”          gint

+
  “n-context-lines”          gint

 
N context lines.

 
Flags: Read / Write / Construct

 
Default value: 3

@@ -156,7 +604,7 @@
 

 

 
The “n-interhunk-lines” property

-
  “n-interhunk-lines”        gint

+
  “n-interhunk-lines”        gint

 
N interhunk lines.

 
Flags: Read / Write / Construct

 
Default value: 0

@@ -164,7 +612,7 @@
 

 

 
The “new-prefix” property

-
  “new-prefix”               gchar *

+
  “new-prefix”               gchar *

 
New prefix.

 
Flags: Read / Write / Construct

 
Default value: NULL

@@ -172,7 +620,7 @@
 

 

 
The “old-prefix” property

-
  “old-prefix”               gchar *

+
  “old-prefix”               gchar *

 
Old prefix.

 
Flags: Read / Write / Construct

 
Default value: NULL

@@ -180,7 +628,7 @@
 

 

 
The “pathspec” property

-
  “pathspec”                 GStrv

+
  “pathspec”                 GStrv

 
Pathspec.

 
Flags: Read / Write / Construct

 

diff -Nru libgit2-glib-0.23.10/docs/reference/html/GgitIndexEntry.html libgit2-glib-0.24.0/docs/reference/html/GgitIndexEntry.html
--- libgit2-glib-0.23.10/docs/reference/html/GgitIndexEntry.html	2016-02-05 16:21:09.000000000 +0000
+++ libgit2-glib-0.24.0/docs/reference/html/GgitIndexEntry.html	2016-03-14 23:14:08.000000000 +0000
@@ -74,7 +74,7 @@
 
 
 
-guint
+guint
 
 
 ggit_index_entries_size ()
@@ -98,7 +98,7 @@
 
 
 
-guint
+guint
 
 
 ggit_index_entry_get_dev ()
@@ -114,7 +114,7 @@
 
 
 
-guint
+guint
 
 
 ggit_index_entry_get_ino ()
@@ -130,7 +130,7 @@
 
 
 
-guint
+guint
 
 
 ggit_index_entry_get_mode ()
@@ -146,7 +146,7 @@
 
 
 
-guint
+guint
 
 
 ggit_index_entry_get_uid ()
@@ -162,7 +162,7 @@
 
 
 
-guint
+guint
 
 
 ggit_index_entry_get_gid ()
@@ -178,7 +178,7 @@
 
 
 
-goffset
+goffset
 
 
 ggit_index_entry_get_file_size ()
@@ -210,7 +210,7 @@
 
 
 
-guint
+guint
 
 
 ggit_index_entry_get_flags ()
@@ -226,7 +226,7 @@
 
 
 
-guint
+guint
 
 
 ggit_index_entry_get_flags_extended ()
@@ -241,7 +241,7 @@
 
 
 
-const gchar *
+const gchar *
 
 
 ggit_index_entry_get_path ()
@@ -257,7 +257,7 @@
 
 
 
-gboolean
+gboolean
 
 
 ggit_index_entry_stat ()
@@ -287,7 +287,7 @@
 

 

 
Object Hierarchy

-
    GBoxed
+
    GBoxed
     ├── GgitIndexEntries
     ╰── GgitIndexEntry
 

@@ -355,7 +355,7 @@
 
ggit_index_entries_get_by_index ()

 
GgitIndexEntry *
 ggit_index_entries_get_by_index (GgitIndexEntries *entries,
-                                 gsize idx);

+                                 gsize idx);

 
Get a GgitIndexEntry by index. Note that the returned GgitIndexEntry is
 _only_ valid as long as:

 
1) The associated index has been closed
@@ -387,7 +387,7 @@
 

 

 
Returns

-
 a GgitIndexEntry or NULL if out of bounds. 

+
 a GgitIndexEntry or NULL if out of bounds. 

 
[transfer full]

 

 

@@ -396,8 +396,8 @@
 
ggit_index_entries_get_by_path ()

 
GgitIndexEntry *
 ggit_index_entries_get_by_path (GgitIndexEntries *entries,
-                                GFile *file,
-                                gint stage);

+                                GFile *file,
+                                gint stage);

 
Get a GgitIndexEntry by index. Note that the returned GgitIndexEntry is
 _only_ valid as long as:

 
1) The associated index has not been closed
@@ -441,14 +441,14 @@
 

 

 
Returns

-
 a GgitIndexEntry or NULL if it was not found. 

+
 a GgitIndexEntry or NULL if it was not found. 

 
[transfer full]

 

 

 

 

 
ggit_index_entries_size ()

-
guint
+
guint
 ggit_index_entries_size (GgitIndexEntries *entries);

 
Get the number of GgitIndexEntry entries.

 

@@ -528,7 +528,7 @@
 

 

 
ggit_index_entry_get_dev ()

-
guint
+
guint
 ggit_index_entry_get_dev (GgitIndexEntry *entry);

 
Get the dev of the index entry.

 

@@ -556,7 +556,7 @@
 
ggit_index_entry_set_dev ()

 
void
 ggit_index_entry_set_dev (GgitIndexEntry *entry,
-                          guint dev);

+                          guint dev);

 
Set the dev of the index entry.

 

 
Parameters

@@ -584,7 +584,7 @@
 

 

 
ggit_index_entry_get_ino ()

-
guint
+
guint
 ggit_index_entry_get_ino (GgitIndexEntry *entry);

 
Get the ino of the index entry.

 

@@ -612,7 +612,7 @@
 
ggit_index_entry_set_ino ()

 
void
 ggit_index_entry_set_ino (GgitIndexEntry *entry,
-                          guint ino);

+                          guint ino);

 
Set the ino of the index entry.

 

 
Parameters

@@ -640,7 +640,7 @@
 

 

 
ggit_index_entry_get_mode ()

-
guint
+
guint
 ggit_index_entry_get_mode (GgitIndexEntry *entry);

 
Get the mode of the index entry.

 

@@ -668,7 +668,7 @@
 
ggit_index_entry_set_mode ()

 
void
 ggit_index_entry_set_mode (GgitIndexEntry *entry,
-                           guint mode);

+                           guint mode);

 
Set the mode of the index entry.

 

 
Parameters

@@ -696,7 +696,7 @@
 

 

 
ggit_index_entry_get_uid ()

-
guint
+
guint
 ggit_index_entry_get_uid (GgitIndexEntry *entry);

 
Get the uid of the index entry.

 

@@ -724,7 +724,7 @@
 
ggit_index_entry_set_uid ()

 
void
 ggit_index_entry_set_uid (GgitIndexEntry *entry,
-                          guint uid);

+                          guint uid);

 
Set the uid of the index entry.

 

 
Parameters

@@ -752,7 +752,7 @@
 

 

 
ggit_index_entry_get_gid ()

-
guint
+
guint
 ggit_index_entry_get_gid (GgitIndexEntry *entry);

 
Get the gid of the index entry.

 

@@ -780,7 +780,7 @@
 
ggit_index_entry_set_gid ()

 
void
 ggit_index_entry_set_gid (GgitIndexEntry *entry,
-                          guint gid);

+                          guint gid);

 
Set the gid of the index entry.

 

 
Parameters

@@ -808,7 +808,7 @@
 

 

 
ggit_index_entry_get_file_size ()

-
goffset
+
goffset
 ggit_index_entry_get_file_size (GgitIndexEntry *entry);

 
Get the file size of the index entry.

 

@@ -836,7 +836,7 @@
 
ggit_index_entry_set_file_size ()

 
void
 ggit_index_entry_set_file_size (GgitIndexEntry *entry,
-                                goffset file_size);

+                                goffset file_size);

 
Set the file size of the index entry.

 

 
Parameters

@@ -920,7 +920,7 @@
 

 

 
ggit_index_entry_get_flags ()

-
guint
+
guint
 ggit_index_entry_get_flags (GgitIndexEntry *entry);

 
Get the flags of the index entry.

 

@@ -948,7 +948,7 @@
 
ggit_index_entry_set_flags ()

 
void
 ggit_index_entry_set_flags (GgitIndexEntry *entry,
-                            guint flags);

+                            guint flags);

 
Set the flags of the index entry.

 

 
Parameters

@@ -976,7 +976,7 @@
 

 

 
ggit_index_entry_get_flags_extended ()

-
guint
+
guint
 ggit_index_entry_get_flags_extended (GgitIndexEntry *entry);

 
Get the extended flags of the index entry.

 

@@ -1004,7 +1004,7 @@
 
ggit_index_entry_set_flags_extended ()

 
void
 ggit_index_entry_set_flags_extended (GgitIndexEntry *entry,
-                                     guint flags_extended);

+                                     guint flags_extended);

 
Set the extended flags of the index entry.

 

 
Parameters

@@ -1032,7 +1032,7 @@
 

 

 
ggit_index_entry_get_path ()

-
const gchar *
+
const gchar *
 ggit_index_entry_get_path (GgitIndexEntry *entry);

 

 

@@ -1040,7 +1040,7 @@
 
ggit_index_entry_set_path ()

 
void
 ggit_index_entry_set_path (GgitIndexEntry *entry,
-                           const gchar *path);

+                           const gchar *path);

 
Set the path of the index entry. The path should be relative to the working
 directory.

 

@@ -1069,10 +1069,10 @@
 

 

 
ggit_index_entry_stat ()

-
gboolean
+
gboolean
 ggit_index_entry_stat (GgitIndexEntry *entry,
-                       GFile *file,
-                       GError **error);

+                       GFile *file,
+                       GError **error);

 
Fill the entry fields from statting file
 .

 

@@ -1096,7 +1096,7 @@
 
 
 
error

-
a GError for error reporting, or NULL.

+
a GError for error reporting, or NULL.

  
 
 
@@ -1104,8 +1104,8 @@
 

 

 
Returns

-
 TRUE if the entry was filled from statting file
-successfully, FALSE otherwise.

+
 TRUE if the entry was filled from statting file
+successfully, FALSE otherwise.

 

 

 

diff -Nru libgit2-glib-0.23.10/docs/reference/html/GgitIndexEntryResolveUndo.html libgit2-glib-0.24.0/docs/reference/html/GgitIndexEntryResolveUndo.html
--- libgit2-glib-0.23.10/docs/reference/html/GgitIndexEntryResolveUndo.html	2016-02-05 16:21:09.000000000 +0000
+++ libgit2-glib-0.24.0/docs/reference/html/GgitIndexEntryResolveUndo.html	2016-03-14 23:14:08.000000000 +0000
@@ -74,7 +74,7 @@
 
 
 
-guint
+guint
 
 
 ggit_index_entries_resolve_undo_size ()
@@ -98,7 +98,7 @@
 
 
 
-guint
+guint
 
 
 ggit_index_entry_resolve_undo_get_mode ()
@@ -114,7 +114,7 @@
 
 
 
-GFile *
+GFile *
 
 
 ggit_index_entry_resolve_undo_get_file ()
@@ -144,7 +144,7 @@
 

 

 
Object Hierarchy

-
    GBoxed
+
    GBoxed
     ├── GgitIndexEntriesResolveUndo
     ╰── GgitIndexEntryResolveUndo
 

@@ -158,7 +158,7 @@
 
ggit_index_entries_resolve_undo_get ()

 
GgitIndexEntryResolveUndo *
 ggit_index_entries_resolve_undo_get (GgitIndexEntriesResolveUndo *entries,
-                                     guint idx);

+                                     guint idx);

 
Get a GgitIndexEntryResolveUndo by index. Note that the returned
 GgitIndexEntryResolveUndo is _only_ valid as long as:

 
1) The associated index has been closed
@@ -198,10 +198,10 @@
 
GgitIndexEntryResolveUndo *
 ggit_index_entries_resolve_undo_get_by_file
                                (GgitIndexEntriesResolveUndo *entries,
-                                GFile *file);

+                                GFile *file);

 
Get an resolve_undo entry specified by path. The returned entry is read
 only and should not be modified by the caller. If the entry could not be
-found, NULL is returned.

+found, NULL is returned.

 

 
Parameters

 

@@ -218,7 +218,7 @@
 
-
+
@@ -226,7 +226,7 @@
 

 
Returns

-
 a GgitIndexEntryResolveUndo or NULL. 

+
 a GgitIndexEntryResolveUndo or NULL. 

 
[transfer full]

 

@@ -287,7 +287,7 @@
 

 
ggit_index_entries_resolve_undo_size ()

-
guint
+
guint
 ggit_index_entries_resolve_undo_size (GgitIndexEntriesResolveUndo *entries);

 
Get the number of GgitIndexEntryResolveUndo entries.

 

@@ -367,10 +367,10 @@
 

 

 
ggit_index_entry_resolve_undo_get_mode ()

-
guint
+
guint
 ggit_index_entry_resolve_undo_get_mode
                                (GgitIndexEntryResolveUndo *entry,
-                                gint stage);

+                                gint stage);

 
Get the mode of the index entry. The returned mode contains the modes from
 stage 1, 2 and 3.

 

@@ -405,7 +405,7 @@
 
ggit_index_entry_resolve_undo_get_id ()

 
GgitOId *
 ggit_index_entry_resolve_undo_get_id (GgitIndexEntryResolveUndo *entry,
-                                      gint stage);

+                                      gint stage);

 
Get the oid of the index entry.

 

 
Parameters

@@ -437,7 +437,7 @@
 

 

 
ggit_index_entry_resolve_undo_get_file ()

-
GFile *
+
GFile *
 ggit_index_entry_resolve_undo_get_file
                                (GgitIndexEntryResolveUndo *entry);

 
Get the file of the index entry.

@@ -458,7 +458,7 @@
 

 

 
Returns

-
 a GFile. 

+
 a GFile. 

 
[transfer full]

 

 

diff -Nru libgit2-glib-0.23.10/docs/reference/html/GgitIndex.html libgit2-glib-0.24.0/docs/reference/html/GgitIndex.html
--- libgit2-glib-0.23.10/docs/reference/html/GgitIndex.html	2016-02-05 16:21:09.000000000 +0000
+++ libgit2-glib-0.24.0/docs/reference/html/GgitIndex.html	2016-03-14 23:14:08.000000000 +0000
@@ -52,7 +52,7 @@
 
 

+GFile *
@@ -164,7 +164,7 @@
 

 
Object Hierarchy

-
    GObject
+
    GObject
     ╰── GgitObjectFactoryBase
         ╰── GgitNative
             ╰── GgitIndex
@@ -174,7 +174,7 @@
 
Implemented Interfaces

 

 GgitIndex implements
- GInitable.

+ GInitable.

 

 
Description

@@ -184,8 +184,8 @@
 

 
ggit_index_open ()

 
GgitIndex *
-ggit_index_open (GFile *file,
-                 GError **error);

+ggit_index_open (GFile *file,
+                 GError **error);
 
Create a new bare Git index object as a memory representation of the Git
 index file in file
 , without a repository to back it.

@@ -200,12 +200,12 @@
 

-
+
-
+
@@ -213,17 +213,17 @@
 

 
Returns

-
 a GgitIndex or NULL if an error occurred. 

+
 a GgitIndex or NULL if an error occurred. 

 
[transfer full]

 

 
ggit_index_read ()

-
gboolean
+
gboolean
 ggit_index_read (GgitIndex *idx,
-                 gboolean force,
-                 GError **error);

+                 gboolean force,
+                 GError **error);

 
Update the contents of an existing index object in memory by reading from
 the hard disk.

 
If force
@@ -256,7 +256,7 @@
 
 

-
+
@@ -264,16 +264,16 @@
 

 
Returns

-
 TRUE if the index could be read from the file associated with the
-index, FALSE otherwise.

+
 TRUE if the index could be read from the file associated with the
+index, FALSE otherwise.

 

 
ggit_index_write ()

-
gboolean
+
gboolean
 ggit_index_write (GgitIndex *idx,
-                  GError **error);

+                  GError **error);

 
Write an existing index object from memory back to disk using an atomic file
 lock.

 

@@ -292,7 +292,7 @@
 
 

-
+
@@ -300,7 +300,7 @@
 

 
Returns

-
 TRUE if the index was successfully written to disk, FALSE otherwise.

+
 TRUE if the index was successfully written to disk, FALSE otherwise.

 

@@ -308,7 +308,7 @@
 
ggit_index_write_tree ()
GgitOId *
 ggit_index_write_tree (GgitIndex *idx,
-                       GError **error);

+                       GError **error);
Write a new tree object to disk containing a representation of the current
 state of the index. The index must be associated to an existing repository
 and must not contain any files in conflict. You can use the resulting tree
@@ -329,7 +329,7 @@
 
 

-
+
@@ -337,17 +337,17 @@
 

 
Returns

-
 a GgitOId or NULL in case of an error.

+
 a GgitOId or NULL in case of an error.

 

 
ggit_index_remove ()

-
gboolean
+
gboolean
 ggit_index_remove (GgitIndex *idx,
-                   GFile *file,
-                   gint stage,
-                   GError **error);

+                   GFile *file,
+                   gint stage,
+                   GError **error);

 
Remove a file from the index (specified by position).

 

 
Parameters

@@ -375,7 +375,7 @@
 
 

-
+
@@ -383,16 +383,16 @@
 

 
Returns

-
 TRUE if the file was successfully removed, FALSE otherwise.

+
 TRUE if the file was successfully removed, FALSE otherwise.

 

 
ggit_index_add ()

-
gboolean
+
gboolean
 ggit_index_add (GgitIndex *idx,
                 GgitIndexEntry *entry,
-                GError **error);

+                GError **error);

 
Add a file to the index.

 

 
Parameters

@@ -415,7 +415,7 @@
 
 

-
+
@@ -423,16 +423,16 @@
 

 
Returns

-
 TRUE if the file was successfully added, FALSE otherwise.

+
 TRUE if the file was successfully added, FALSE otherwise.

 

 
ggit_index_add_file ()

-
gboolean
+
gboolean
 ggit_index_add_file (GgitIndex *idx,
-                     GFile *file,
-                     GError **error);

+                     GFile *file,
+                     GError **error);

 
Add a file to the index. The specified file must be in the working directory
 and must exist and be readable.

 

@@ -456,7 +456,7 @@
 
 

-
+
@@ -464,16 +464,16 @@
 

 
Returns

-
 TRUE if the file was added to the index or FALSE if there was an error.

+
 TRUE if the file was added to the index or FALSE if there was an error.

 

 
ggit_index_add_path ()

-
gboolean
+
gboolean
 ggit_index_add_path (GgitIndex *idx,
-                     const gchar *path,
-                     GError **error);

+                     const gchar *path,
+                     GError **error);

 
Add a file to the index by path. You can specify both relative paths
 (to the working directory) and absolute paths. Absolute paths however must
 reside in the working directory. The specified path must exist and must be
@@ -499,7 +499,7 @@
 
 

-
+
@@ -507,7 +507,7 @@
 

 
Returns

-
 TRUE if the file was added to the index or FALSE if there was an error.

+
 TRUE if the file was added to the index or FALSE if there was an error.

 

@@ -604,7 +604,7 @@
 
Property Details

 
The “file” property

-
  “file”                     GFile *

+
  “file”                     GFile *

 
File.

 
Flags: Read / Write / Construct Only

 

diff -Nru libgit2-glib-0.23.10/docs/reference/html/GgitNative.html libgit2-glib-0.24.0/docs/reference/html/GgitNative.html
--- libgit2-glib-0.23.10/docs/reference/html/GgitNative.html	2016-02-05 16:21:09.000000000 +0000
+++ libgit2-glib-0.24.0/docs/reference/html/GgitNative.html	2016-03-14 23:14:08.000000000 +0000
@@ -42,7 +42,7 @@
 
-
+
@@ -69,7 +69,7 @@
 

 
Object Hierarchy

-
    GObject
+
    GObject
     ╰── GgitObjectFactoryBase
         ╰── GgitNative
             ├── GgitObject
@@ -123,7 +123,7 @@
 
Property Details

 

 
The “native” property

-
  “native”                   gpointer

+
  “native”                   gpointer

 
Native.

 
Flags: Write / Construct Only

 

diff -Nru libgit2-glib-0.23.10/docs/reference/html/GgitObjectFactoryBase.html libgit2-glib-0.24.0/docs/reference/html/GgitObjectFactoryBase.html
--- libgit2-glib-0.23.10/docs/reference/html/GgitObjectFactoryBase.html	2016-02-05 16:21:09.000000000 +0000
+++ libgit2-glib-0.24.0/docs/reference/html/GgitObjectFactoryBase.html	2016-03-14 23:14:08.000000000 +0000
@@ -53,7 +53,7 @@
 

 
Object Hierarchy

-
    GObject
+
    GObject
     ╰── GgitObjectFactoryBase
         ╰── GgitNative
 

diff -Nru libgit2-glib-0.23.10/docs/reference/html/GgitObjectFactory.html libgit2-glib-0.24.0/docs/reference/html/GgitObjectFactory.html
--- libgit2-glib-0.23.10/docs/reference/html/GgitObjectFactory.html	2016-02-05 16:21:09.000000000 +0000
+++ libgit2-glib-0.24.0/docs/reference/html/GgitObjectFactory.html	2016-03-14 23:14:08.000000000 +0000
@@ -66,7 +66,7 @@
 
 

-
+
-
+
@@ -158,8 +158,8 @@
 
ggit_object_factory_unregister ()
void
 ggit_object_factory_unregister (GgitObjectFactory *factory,
-                                GType basetype,
-                                GType subtype);

+                                GType basetype,
+                                GType subtype);
Unregister a subtype from the factory.

 
Parameters

@@ -177,12 +177,12 @@
 
 

-
+
-
+
@@ -192,12 +192,12 @@
 

 
ggit_object_factory_construct ()

-
GObject *
+
GObject *
 ggit_object_factory_construct (GgitObjectFactory *factory,
-                               GObjectClass *parent_class,
-                               GType basetype,
-                               guint n_construct_properties,
-                               GObjectConstructParam *construct_properties);

+                               GObjectClass *parent_class,
+                               GType basetype,
+                               guint n_construct_properties,
+                               GObjectConstructParam *construct_properties);

 
Construct a new object.

 

 
Parameters

@@ -215,12 +215,12 @@
 
 

-
+
-
+
@@ -230,7 +230,7 @@
 
-
+
@@ -238,7 +238,7 @@
 

 
Returns

-
 a GObject. 

+
 a GObject. 

 
[transfer full]

 

diff -Nru libgit2-glib-0.23.10/docs/reference/html/GgitObject.html libgit2-glib-0.24.0/docs/reference/html/GgitObject.html
--- libgit2-glib-0.23.10/docs/reference/html/GgitObject.html	2016-02-05 16:21:09.000000000 +0000
+++ libgit2-glib-0.24.0/docs/reference/html/GgitObject.html	2016-03-14 23:14:08.000000000 +0000
@@ -80,7 +80,7 @@
 

 
Object Hierarchy

-
    GObject
+
    GObject
     ╰── GgitObjectFactoryBase
         ╰── GgitNative
             ╰── GgitObject
@@ -147,7 +147,7 @@
 

 
Returns

 
 the GgitRepository that owns this object.
-The returned value must be free'd calling g_object_unref(). 

+The returned value must be free'd calling g_object_unref(). 

 
[transfer full]

 

 

diff -Nru libgit2-glib-0.23.10/docs/reference/html/GgitOId.html libgit2-glib-0.24.0/docs/reference/html/GgitOId.html
--- libgit2-glib-0.23.10/docs/reference/html/GgitOId.html	2016-02-05 16:21:09.000000000 +0000
+++ libgit2-glib-0.24.0/docs/reference/html/GgitOId.html	2016-03-14 23:14:08.000000000 +0000
@@ -74,7 +74,7 @@
 
-
+

 

 
file
a GFile.
a GFile.

  
 

 
 
 
 

 
-gboolean
+gboolean
 
 
 ggit_index_read ()
@@ -60,7 +60,7 @@
 

 

 
-gboolean
+gboolean
 
 
 ggit_index_write ()
@@ -76,7 +76,7 @@
 

 

 
-gboolean
+gboolean
 
 
 ggit_index_remove ()
@@ -84,7 +84,7 @@
 

 

 
-gboolean
+gboolean
 
 
 ggit_index_add ()
@@ -92,7 +92,7 @@
 

 

 
-gboolean
+gboolean
 
 
 ggit_index_add_file ()
@@ -100,7 +100,7 @@
 

 

 
-gboolean
+gboolean
 
 
 ggit_index_add_path ()
@@ -143,7 +143,7 @@
 
 

 
-GFile *
 file
 Read / Write / Construct Only
 

 
 
 

 
file
a GFile.
a GFile.

  
 

 

 
error
a GError for error reporting, or NULL.
a GError for error reporting, or NULL.

  
 

 
 
 
 
 

 
error
a GError for error reporting, or NULL.
a GError for error reporting, or NULL.

  
 

 
 
 
 
 

 
error
a GError for error reporting, or NULL.
a GError for error reporting, or NULL.

  
 

 
 
 
 
 
 

 
error
a GError for error reporting, or NULL.
a GError for error reporting, or NULL.

  
 

 
 
 
 
 

 
error
a GError for error reporting, or NULL.
a GError for error reporting, or NULL.

  
 

 
 
 
 
 

 
error
a GError for error reporting, or NULL.
a GError for error reporting, or NULL.

  
 

 
 
 
 
 

 
error
a GError for error reporting, or NULL.
a GError for error reporting, or NULL.

  
 

 
 
 
 
 

 
error
a GError for error reporting, or NULL.
a GError for error reporting, or NULL.

  
 

 
 
 
 
 
 
 
gpointergpointer
 native
 Write / Construct Only
 

 
 

 
-GObject *
+GObject *
 
 
 ggit_object_factory_construct ()
@@ -90,7 +90,7 @@
 
 

 
Object Hierarchy

-
    GObject
+
    GObject
     ╰── GgitObjectFactory
 

 

@@ -115,8 +115,8 @@
 
ggit_object_factory_register ()

 
void
 ggit_object_factory_register (GgitObjectFactory *factory,
-                              GType basetype,
-                              GType subtype);

+                              GType basetype,
+                              GType subtype);
 
Register subtype
  as the instantiation class for basetype
 . Each time an
@@ -141,12 +141,12 @@
 

 

 
basetype
a GType.
a GType.

  
 

 

 
subtype
a GType.
a GType.

  
 

 
 
 
 

 
basetype
a GType.
a GType.

  
 

 

 
subtype
a GType.
a GType.

  
 

 
 

 
parent_class
a GObjectClass.
a GObjectClass.

  
 

 

 
basetype
a GType.
a GType.

  
 

 

 

 
construct_properties
 a list of GObjectConstructParam. 
 a list of GObjectConstructParam. 

 [array length=n_construct_properties]
 

 
 
 
 
 

 
-gint
+gint
 
 
 ggit_oid_compare ()
@@ -82,7 +82,7 @@
 

 

 
-gchar *
+gchar *
 
 
 ggit_oid_to_string ()
@@ -90,7 +90,7 @@
 

 

 
-guint
+guint
 
 
 ggit_oid_hash ()
@@ -98,7 +98,7 @@
 

 

 
-gboolean
+gboolean
 
 
 ggit_oid_equal ()
@@ -122,7 +122,7 @@
 
 

 
Object Hierarchy

-
    GBoxed
+
    GBoxed
     ╰── GgitOId
 

 

@@ -185,7 +185,7 @@
 

 
ggit_oid_new_from_string ()

 
GgitOId *
-ggit_oid_new_from_string (const gchar *str);

+ggit_oid_new_from_string (const gchar *str);
 
Parses a hex formatted object id into a GgitOId.

 

 
Parameters

@@ -206,7 +206,7 @@
 

 

 
Returns

-
 a newly allocated GgitOId or NULL on error. 

+
 a newly allocated GgitOId or NULL on error. 

 
[transfer full]

 

 

@@ -214,7 +214,7 @@
 

 
ggit_oid_new_from_raw ()

 
GgitOId *
-ggit_oid_new_from_raw (const guchar *raw);

+ggit_oid_new_from_raw (const guchar *raw);
 
Creates a new GgitOId from a raw oid.

 

 
Parameters

@@ -240,7 +240,7 @@
 

 

 
ggit_oid_compare ()

-
gint
+
gint
 ggit_oid_compare (GgitOId *a,
                   GgitOId *b);

 
Compare two GgitOId structures.

@@ -274,7 +274,7 @@
 

 

 
ggit_oid_to_string ()

-
gchar *
+
gchar *
 ggit_oid_to_string (GgitOId *oid);

 
Converts oid
  into a readable string.

@@ -303,7 +303,7 @@
 

 

 
ggit_oid_hash ()

-
guint
+
guint
 ggit_oid_hash (GgitOId const *oid);

 
Computes a hash value for a git object identifier.

 

@@ -329,7 +329,7 @@
 

 

 
ggit_oid_equal ()

-
gboolean
+
gboolean
 ggit_oid_equal (GgitOId const *a,
                 GgitOId const *b);

 
Compares two GgitOId for equality.

@@ -357,9 +357,9 @@
 

 

 
Returns

-
 TRUE if a
+
 TRUE if a
 and b
-are equal, FALSE otherwise

+are equal, FALSE otherwise

 

 

 

diff -Nru libgit2-glib-0.23.10/docs/reference/html/GgitPatch.html libgit2-glib-0.24.0/docs/reference/html/GgitPatch.html
--- libgit2-glib-0.23.10/docs/reference/html/GgitPatch.html	2016-02-05 16:21:09.000000000 +0000
+++ libgit2-glib-0.24.0/docs/reference/html/GgitPatch.html	2016-03-14 23:14:08.000000000 +0000
@@ -7,7 +7,7 @@
 
 
 
-
+
 
 
 
@@ -21,7 +21,7 @@
 
Home
 Up
 PrevNextNext
 

 

 

@@ -58,7 +58,7 @@
 
 
 
-gboolean
+gboolean
 
 
 ggit_patch_get_line_stats ()
@@ -66,7 +66,7 @@
 
 
 
-gsize
+gsize
 
 
 ggit_patch_get_num_hunks ()
@@ -74,7 +74,7 @@
 
 
 
-gint
+gint
 
 
 ggit_patch_get_num_lines_in_hunk ()
@@ -106,7 +106,7 @@
 
 
 
-gboolean
+gboolean
 
 
 ggit_patch_to_stream ()
@@ -114,7 +114,7 @@
 
 
 
-gchar *
+gchar *
 
 
 ggit_patch_to_string ()
@@ -146,7 +146,7 @@
 

 

 
Object Hierarchy

-
    GBoxed
+
    GBoxed
     ╰── GgitPatch
 

 

@@ -186,8 +186,8 @@
 
ggit_patch_get_hunk ()

 
GgitDiffHunk *
 ggit_patch_get_hunk (GgitPatch *patch,
-                     gsize idx,
-                     GError **error);

+                     gsize idx,
+                     GError **error);

Get the idx 'th hunk in the patch.

@@ -211,7 +211,7 @@

error

-

a GError

+

a GError

  @@ -219,19 +219,19 @@

Returns

-

a new GgitDiffHunk or NULL on error.

+

a new GgitDiffHunk or NULL on error.

[transfer full]

ggit_patch_get_line_stats ()

-
gboolean
+
gboolean
 ggit_patch_get_line_stats (GgitPatch *patch,
-                           gsize *total_context,
-                           gsize *total_additions,
-                           gsize *total_deletions,
-                           GError **error);

+                           gsize *total_context,
+                           gsize *total_additions,
+                           gsize *total_deletions,
+                           GError **error);

Get the line statistics of the patch.

Parameters

@@ -264,7 +264,7 @@

error

-

a GError.

+

a GError.

  @@ -272,13 +272,13 @@

Returns

-

TRUE if successfull, FALSE otherwise.

+

TRUE if successfull, FALSE otherwise.

ggit_patch_get_num_hunks ()

-
gsize
+
gsize
 ggit_patch_get_num_hunks (GgitPatch *patch);

 
Get the number of hunks in the patch.

 

@@ -304,9 +304,9 @@
 

 

 
ggit_patch_get_num_lines_in_hunk ()

-
gint
+
gint
 ggit_patch_get_num_lines_in_hunk (GgitPatch *patch,
-                                  gsize hunk);

+                                  gsize hunk);

 
Get the number of lines in hunk
 .

 

@@ -341,11 +341,11 @@
 
ggit_patch_new_from_blobs ()

 
GgitPatch *
 ggit_patch_new_from_blobs (GgitBlob *old_blob,
-                           const gchar *old_as_path,
+                           const gchar *old_as_path,
                            GgitBlob *new_blob,
-                           const gchar *new_as_path,
+                           const gchar *new_as_path,
                            GgitDiffOptions *diff_options,
-                           GError **error);

+                           GError **error);

Directly generate a patch from the difference between two blobs.

This is just like ggit_diff_blobs() except it generates a patch object for the difference instead of directly making callbacks. You can use the @@ -368,7 +368,7 @@

old_as_path

treat old_blob -as if it had this filename, or NULL,.

+as if it had this filename, or NULL,.

[allow-none] @@ -379,17 +379,17 @@

new_as_path

treat new_blob -as if it had this filename, or NULL,.

+as if it had this filename, or NULL,.

[allow-none]

diff_options

-

a GgitDiffOptions, or NULL.

+

a GgitDiffOptions, or NULL.

[allow-none]

error

-

a GError for error reporting, or NULL.

+

a GError for error reporting, or NULL.

  @@ -401,8 +401,8 @@

ggit_patch_new_from_diff ()

GgitPatch *
 ggit_patch_new_from_diff (GgitDiff *diff,
-                          gsize idx,
-                          GError **error);
+ gsize idx, + GError **error);

The GgitPatch is a newly created object contains the text diffs for the delta. You have to call ggit_patch_unref() when you are done with it. You can use the patch object to loop over all the hunks @@ -428,7 +428,7 @@

error

-

a GError for error reporting, or NULL.

+

a GError for error reporting, or NULL.

  @@ -472,10 +472,10 @@

ggit_patch_to_stream ()

-
gboolean
+
gboolean
 ggit_patch_to_stream (GgitPatch *patch,
-                      GOutputStream *stream,
-                      GError **error);

+                      GOutputStream *stream,
+                      GError **error);

Write the contents of a patch to the provided stream.

Parameters

@@ -493,12 +493,12 @@

stream

-

a GOutputStream.

+

a GOutputStream.

 

error

-

a GError for error reporting, or NULL.

+

a GError for error reporting, or NULL.

  @@ -506,15 +506,15 @@

Returns

-

TRUE if the patch was written successfully, FALSE otherwise.

+

TRUE if the patch was written successfully, FALSE otherwise.

ggit_patch_to_string ()

-
gchar *
+
gchar *
 ggit_patch_to_string (GgitPatch *patch,
-                      GError **error);

+                      GError **error);

Gets the content of a patch as a single diff text.

Parameters

@@ -532,7 +532,7 @@

error

-

a GError for error reporting, or NULL.

+

a GError for error reporting, or NULL.

  diff -Nru libgit2-glib-0.23.10/docs/reference/html/GgitPushOptions.html libgit2-glib-0.24.0/docs/reference/html/GgitPushOptions.html --- libgit2-glib-0.23.10/docs/reference/html/GgitPushOptions.html 1970-01-01 00:00:00.000000000 +0000 +++ libgit2-glib-0.24.0/docs/reference/html/GgitPushOptions.html 2016-03-14 23:14:08.000000000 +0000 @@ -0,0 +1,229 @@ + + + + +GgitPushOptions: libgit2-glib Reference Manual + + + + + + + + + + + + + + + + +
+
+
+ + +
+

GgitPushOptions

+

GgitPushOptions

+
+
+

Functions

+
++++ + + + + + + + + + + + + + + +
+GgitPushOptions * + +ggit_push_options_new () +
+gint + +ggit_push_options_get_parallelism () +
+void + +ggit_push_options_set_parallelism () +
+
+
+

Properties

+
+++++ + + + + + +
gintparallelismRead / Write / Construct
+
+
+

Types and Values

+
++++ + + + + + + + + + + + + + + +
#defineGGIT_TYPE_PUSH_OPTIONS
structGgitPushOptionsClass
 GgitPushOptions
+
+
+

Object Hierarchy

+
    GObject
+    ╰── GgitPushOptions
+
+
+
+

Description

+
+
+

Functions

+
+

ggit_push_options_new ()

+
GgitPushOptions *
+ggit_push_options_new (void);
+

Create a new push options object.

+
+

Returns

+

a GgitPushOptions.

+
+
+
+
+

ggit_push_options_get_parallelism ()

+
gint
+ggit_push_options_get_parallelism (GgitPushOptions *options);
+

Get the number of parallel threads to use when creating the pack file +to push. The special value 0 indicates that the number of threads will +be automatically detected.

+
+

Parameters

+
+++++ + + + + + +

options

a GgitPushOptions.

 
+
+
+

Returns

+

the number of parallel threads, or 0 for auto-detect.

+
+
+
+
+

ggit_push_options_set_parallelism ()

+
void
+ggit_push_options_set_parallelism (GgitPushOptions *options,
+                                   gint parallelism);
+

Set the number of parallel threads to use when creating the pack file +to push. The special value 0 can be specified for parallelism + indicating that +the number of threads will be automatically detected.

+
+

Parameters

+
+++++ + + + + + + + + + + + + +

options

a GgitPushOptions.

 

parallelism

the number of threads, or 0 for auto-detect.

 
+
+
+
+
+

Types and Values

+
+

GGIT_TYPE_PUSH_OPTIONS

+
#define GGIT_TYPE_PUSH_OPTIONS (ggit_push_options_get_type ())
+
+
+
+
+

struct GgitPushOptionsClass

+
struct GgitPushOptionsClass {
+	GObjectClass parent_class;
+};
+
+
+
+
+

GgitPushOptions

+
typedef struct _GgitPushOptions GgitPushOptions;
+

Represents a git push options.

+
+
+
+

Property Details

+
+

The “parallelism” property

+
  “parallelism”              gint
+

Parallelism.

+

Flags: Read / Write / Construct

+

Allowed values: >= 0

+

Default value: 0

+
+
+
+
+
Generated by GTK-Doc V1.24.1
+ + \ No newline at end of file diff -Nru libgit2-glib-0.23.10/docs/reference/html/GgitRef.html libgit2-glib-0.24.0/docs/reference/html/GgitRef.html --- libgit2-glib-0.23.10/docs/reference/html/GgitRef.html 2016-02-05 16:21:09.000000000 +0000 +++ libgit2-glib-0.24.0/docs/reference/html/GgitRef.html 2016-03-14 23:14:08.000000000 +0000 @@ -6,7 +6,7 @@ - + @@ -20,7 +20,7 @@ Home Up -Prev +Prev Next
@@ -42,7 +42,7 @@ -gboolean +gboolean ggit_ref_is_valid_name () @@ -57,7 +57,7 @@ -const gchar * +const gchar * ggit_ref_get_symbolic_target () @@ -72,21 +72,21 @@ -const gchar * +const gchar * ggit_ref_get_name () -const gchar * +const gchar * ggit_ref_get_shorthand () -const gchar * +const gchar * ggit_ref_to_string () @@ -150,7 +150,7 @@ -gboolean +gboolean ggit_ref_has_log () @@ -174,7 +174,7 @@ -gboolean +gboolean ggit_ref_is_branch () @@ -182,7 +182,7 @@ -gboolean +gboolean ggit_ref_is_note () @@ -190,7 +190,7 @@ -gboolean +gboolean ggit_ref_is_remote () @@ -198,7 +198,7 @@ -gboolean +gboolean ggit_ref_is_tag () @@ -232,9 +232,9 @@

Object Hierarchy

-
    GEnum
+
    GEnum
     ╰── GgitRefType
-    GObject
+    GObject
     ╰── GgitObjectFactoryBase
         ╰── GgitNative
             ╰── GgitRef
@@ -248,8 +248,8 @@
 
Functions

 

 
ggit_ref_is_valid_name ()

-
gboolean
-ggit_ref_is_valid_name (const gchar *name);

+
gboolean
+ggit_ref_is_valid_name (const gchar *name);

 
Check if the given name
  is a valid name for a reference. Note that name
 
@@ -275,8 +275,8 @@
 

 

 
Returns

-
 TRUE if name
-is valid, FALSE otherwise.

+
 TRUE if name
+is valid, FALSE otherwise.
@@ -304,14 +304,14 @@

Returns

-

a new oid if available, NULL otherwise.

+

a new oid if available, NULL otherwise.

[transfer full]

ggit_ref_get_symbolic_target ()

-
const gchar *
+
const gchar *
 ggit_ref_get_symbolic_target (GgitRef *ref);

 
Get full name to the reference pointed to by a symbolic reference.
 Only available if the reference is symbolic.

@@ -332,7 +332,7 @@

Returns

-

the name if available, NULL otherwise.

+

the name if available, NULL otherwise.

@@ -366,7 +366,7 @@

ggit_ref_get_name ()

-
const gchar *
+
const gchar *
 ggit_ref_get_name (GgitRef *ref);

 
Gets the full name of ref
 .

@@ -393,7 +393,7 @@
 

 

 
ggit_ref_get_shorthand ()

-
const gchar *
+
const gchar *
 ggit_ref_get_shorthand (GgitRef *ref);

 
Gets the shorthand name of ref
 .

@@ -420,7 +420,7 @@
 

 

 
ggit_ref_to_string ()

-
const gchar *
+
const gchar *
 ggit_ref_to_string (GgitRef *ref);

 
Get a string representation of the ref.

 

@@ -448,7 +448,7 @@
 
ggit_ref_resolve ()

 
GgitRef *
 ggit_ref_resolve (GgitRef *ref,
-                  GError **error);

+                  GError **error);

 
Resolves a symbolic reference.

 
This method iteratively peels a symbolic reference
 until it resolves to a direct reference to an OID.

@@ -470,7 +470,7 @@
 
 
 
error

-
a GError for error reporting, or NULL.

+
a GError for error reporting, or NULL.

  
 
 
@@ -515,9 +515,9 @@
 
ggit_ref_set_symbolic_target ()

 
GgitRef *
 ggit_ref_set_symbolic_target (GgitRef *ref,
-                              const gchar *target,
-                              const gchar *log_message,
-                              GError **error);

+                              const gchar *target,
+                              const gchar *log_message,
+                              GError **error);

 
Create a new reference with the same name as the given reference but a
 different symbolic target. The reference must be a symbolic reference,
 otherwise this will fail.

@@ -550,7 +550,7 @@
 
 
 
error

-
a GError for error reporting, or NULL.

+
a GError for error reporting, or NULL.

  
 
 
@@ -568,8 +568,8 @@
 
GgitRef *
 ggit_ref_set_target (GgitRef *ref,
                      GgitOId *oid,
-                     const gchar *log_message,
-                     GError **error);

+                     const gchar *log_message,
+                     GError **error);

Create a new reference with the same name as the given reference but a different OID target. The reference must be a direct reference, otherwise this will fail.

@@ -600,7 +600,7 @@

error

-

a GError for error reporting, or NULL.

+

a GError for error reporting, or NULL.

  @@ -617,10 +617,10 @@

ggit_ref_rename ()

GgitRef *
 ggit_ref_rename (GgitRef *ref,
-                 const gchar *new_name,
-                 gboolean force,
-                 const gchar *log_message,
-                 GError **error);
+ const gchar *new_name, + gboolean force, + const gchar *log_message, + GError **error);

Rename an existing reference.

This method works for both direct and symbolic references.

The new name will be checked for validity. @@ -656,7 +656,7 @@

force

-

TRUE to force the renaming.

+

TRUE to force the renaming.

  @@ -666,7 +666,7 @@

error

-

a GError for error reporting, or NULL.

+

a GError for error reporting, or NULL.

  @@ -683,7 +683,7 @@

ggit_ref_delete ()

void
 ggit_ref_delete (GgitRef *ref,
-                 GError **error);
+ GError **error);

Deletes ref .

This method works for both direct and symbolic references.

@@ -705,7 +705,7 @@

error

-

a GError for error reporting, or NULL.

+

a GError for error reporting, or NULL.

  @@ -717,7 +717,7 @@

ggit_ref_lookup ()

GgitObject *
 ggit_ref_lookup (GgitRef *ref,
-                 GError **error);
+ GError **error);

Convenient method to resolve a reference to an object.

Parameters

@@ -735,7 +735,7 @@

error

-

a GError for error reporting, or NULL.

+

a GError for error reporting, or NULL.

  @@ -750,7 +750,7 @@

ggit_ref_has_log ()

-
gboolean
+
gboolean
 ggit_ref_has_log (GgitRef *ref);

 
Get whether ref
  has an existing log.

@@ -771,8 +771,8 @@

Returns

-

TRUE if ref -has a log, FALSE otherwise.

+

TRUE if ref +has a log, FALSE otherwise.

@@ -780,7 +780,7 @@

ggit_ref_get_log ()

GgitReflog *
 ggit_ref_get_log (GgitRef *ref,
-                  GError **error);
+ GError **error);

Gets the GgitReflog for ref . The reflog will be created if it doesn't exist yet.

@@ -800,7 +800,7 @@

error

-

a GError for error reporting, or NULL.

+

a GError for error reporting, or NULL.

  @@ -817,7 +817,7 @@

ggit_ref_delete_log ()

void
 ggit_ref_delete_log (GgitRef *ref,
-                     GError **error);
+ GError **error);

Deletes the log for ref , on error error is set.

@@ -837,7 +837,7 @@

error

-

a GError for error reporting, or NULL.

+

a GError for error reporting, or NULL.

  @@ -847,7 +847,7 @@

ggit_ref_is_branch ()

-
gboolean
+
gboolean
 ggit_ref_is_branch (GgitRef *ref);

 
Check whether the reference is a branch.

 

@@ -867,13 +867,13 @@
 

 

 
Returns

-
 TRUE if the reference is a branch, FALSE otherwise.

+
 TRUE if the reference is a branch, FALSE otherwise.

ggit_ref_is_note ()

-
gboolean
+
gboolean
 ggit_ref_is_note (GgitRef *ref);

 
Check whether the reference is a note.

 

@@ -893,13 +893,13 @@
 

 

 
Returns

-
 TRUE if the reference is a note, FALSE otherwise.

+
 TRUE if the reference is a note, FALSE otherwise.

ggit_ref_is_remote ()

-
gboolean
+
gboolean
 ggit_ref_is_remote (GgitRef *ref);

 
Check whether the reference is a remote.

 

@@ -919,13 +919,13 @@
 

 

 
Returns

-
 TRUE if the reference is a remote, FALSE otherwise.

+
 TRUE if the reference is a remote, FALSE otherwise.

ggit_ref_is_tag ()

-
gboolean
+
gboolean
 ggit_ref_is_tag (GgitRef *ref);

 
Check whether the reference is a tag.

 

@@ -945,7 +945,7 @@
 

 

 
Returns

-
 TRUE if the reference is a tag, FALSE otherwise.

+
 TRUE if the reference is a tag, FALSE otherwise.
diff -Nru libgit2-glib-0.23.10/docs/reference/html/GgitReflogEntry.html libgit2-glib-0.24.0/docs/reference/html/GgitReflogEntry.html --- libgit2-glib-0.23.10/docs/reference/html/GgitReflogEntry.html 2016-02-05 16:21:09.000000000 +0000 +++ libgit2-glib-0.24.0/docs/reference/html/GgitReflogEntry.html 2016-03-14 23:14:08.000000000 +0000 @@ -81,7 +81,7 @@ -const gchar * +const gchar * ggit_reflog_entry_get_message () @@ -105,7 +105,7 @@

Object Hierarchy

-
    GBoxed
+
    GBoxed
     ╰── GgitReflogEntry
@@ -249,7 +249,7 @@

ggit_reflog_entry_get_message ()

-
const gchar *
+
const gchar *
 ggit_reflog_entry_get_message (GgitReflogEntry *reflog_entry);

 
Gets the message.

 

diff -Nru libgit2-glib-0.23.10/docs/reference/html/GgitReflog.html libgit2-glib-0.24.0/docs/reference/html/GgitReflog.html
--- libgit2-glib-0.23.10/docs/reference/html/GgitReflog.html	2016-02-05 16:21:09.000000000 +0000
+++ libgit2-glib-0.24.0/docs/reference/html/GgitReflog.html	2016-03-14 23:14:08.000000000 +0000
@@ -58,7 +58,7 @@
 
 
 
-guint
+guint
 
 
 ggit_reflog_get_entry_count ()
@@ -90,7 +90,7 @@
 

 

 
Object Hierarchy

-
    GBoxed
+
    GBoxed
     ╰── GgitReflog
 

 

@@ -155,7 +155,7 @@
 

 

 
ggit_reflog_get_entry_count ()

-
guint
+
guint
 ggit_reflog_get_entry_count (GgitReflog *reflog);

 
Gets the number of log entries in reflog
 .

@@ -184,10 +184,10 @@
 
ggit_reflog_get_entry_from_index ()

 
GgitReflogEntry *
 ggit_reflog_get_entry_from_index (GgitReflog *reflog,
-                                  guint idx);

+                                  guint idx);

 
Gets the GgitReflogEntry at idx
  in reflog
-, or NULL if not found.

+, or NULL if not found.

 

 
Parameters

 

@@ -212,7 +212,7 @@
 

 
Returns

-
 the reflog entry at the index, or NULL if not found.

+
 the reflog entry at the index, or NULL if not found.

 

diff -Nru libgit2-glib-0.23.10/docs/reference/html/GgitRefSpec.html libgit2-glib-0.24.0/docs/reference/html/GgitRefSpec.html
--- libgit2-glib-0.23.10/docs/reference/html/GgitRefSpec.html	2016-02-05 16:21:09.000000000 +0000
+++ libgit2-glib-0.24.0/docs/reference/html/GgitRefSpec.html	2016-03-14 23:14:08.000000000 +0000
@@ -57,14 +57,14 @@
 
-
-
-
-
-
-
+
@@ -303,7 +303,7 @@
 

 
ggit_remote_get_name ()

-
const gchar *
+
const gchar *
 ggit_remote_get_name (GgitRemote *remote);

 
Gets the remote's name.

 

@@ -330,7 +330,7 @@
 

 

 
ggit_remote_get_url ()

-
const gchar *
+
const gchar *
 ggit_remote_get_url (GgitRemote *remote);

 
Gets the remote's url.

 

@@ -361,7 +361,8 @@
 ggit_remote_connect (GgitRemote *remote,
                      GgitDirection direction,
                      GgitRemoteCallbacks *callbacks,
-                     GError **error);

+                     const gchar * const *custom_headers,
+                     GError **error);

 
Opens a connection to a remote.
 The transport is selected based on the URL. The direction argument
 is due to a limitation of the git protocol (over TCP or SSH) which
@@ -391,8 +392,13 @@
 

+
+
+
+
+
-
+
@@ -402,7 +408,7 @@
 

 
ggit_remote_get_connected ()

-
gboolean
+
gboolean
 ggit_remote_get_connected (GgitRemote *remote);

 
Check whether remote
  is connected.

@@ -423,7 +429,7 @@
 

 
Returns

-
 TRUE if it is connected.

+
 TRUE if it is connected.

 

@@ -454,7 +460,7 @@
 
ggit_remote_list ()
GgitRemoteHead **
 ggit_remote_list (GgitRemote *remote,
-                  GError **error);

+                  GError **error);
Get a list of refs at the remote.

 
Parameters

@@ -472,7 +478,7 @@
 
 

-
+
@@ -514,7 +520,7 @@
 

 
ggit_remote_head_get_name ()

-
const gchar *
+
const gchar *
 ggit_remote_head_get_name (GgitRemoteHead *remote_head);

 
Get the remote head name.

 

@@ -567,13 +573,13 @@
 

 

 
ggit_remote_head_get_type ()

-
GType
+
GType
 ggit_remote_head_get_type (void);

 

 

 

 
ggit_remote_head_is_local ()

-
gboolean
+
gboolean
 ggit_remote_head_is_local (GgitRemoteHead *remote_head);

 
Get whether the remote head is local.

 

diff -Nru libgit2-glib-0.23.10/docs/reference/html/GgitRepository.html libgit2-glib-0.24.0/docs/reference/html/GgitRepository.html
--- libgit2-glib-0.23.10/docs/reference/html/GgitRepository.html	2016-02-05 16:21:09.000000000 +0000
+++ libgit2-glib-0.24.0/docs/reference/html/GgitRepository.html	2016-03-14 23:14:08.000000000 +0000
@@ -44,7 +44,7 @@
 

-
+
-
+
+GFile *
+gchar *
+GFile *
@@ -534,13 +534,13 @@
 

 
Object Hierarchy

-
    GEnum
+
    GEnum
     ╰── GgitResetType
-    GFlags
+    GFlags
     ├── GgitCreateFlags
     ├── GgitStashFlags
     ╰── GgitStatusFlags
-    GObject
+    GObject
     ╰── GgitObjectFactoryBase
         ╰── GgitNative
             ╰── GgitRepository
@@ -550,7 +550,7 @@
 
Implemented Interfaces

 

 GgitRepository implements
- GInitable.

+ GInitable.

 

 
Description

@@ -559,9 +559,9 @@
 
Functions

 

 
GgitReferencesNameCallback ()

-
gint
-(*GgitReferencesNameCallback) (const gchar *name,
-                               gpointer user_data);

+
gint
+(*GgitReferencesNameCallback) (const gchar *name,
+                               gpointer user_data);

 
The type of the callback functions for retrieving the references
 in a GgitRepository. See ggit_repository_references_foreach_name().

 

@@ -594,11 +594,11 @@
 

 

 
GgitStashCallback ()

-
gint
-(*GgitStashCallback) (gsize index,
-                      const gchar *message,
+
gint
+(*GgitStashCallback) (gsize index,
+                      const gchar *message,
                       GgitOId *stash_oid,
-                      gpointer user_data);

+                      gpointer user_data);

 
When iterating over all the stashed states, callback that will be
 issued per entry. See ggit_repository_stash_foreach().

 

@@ -642,10 +642,10 @@
 

 

 
GgitStatusCallback ()

-
gint
-(*GgitStatusCallback) (const gchar *path,
+
gint
+(*GgitStatusCallback) (const gchar *path,
                        GgitStatusFlags status_flags,
-                       gpointer user_data);

+                       gpointer user_data);

 
The type of the callback functions for retrieving the status of the files
 in a GgitRepository. See ggit_repository_file_status_foreach().

 

@@ -684,8 +684,8 @@
 

 
ggit_repository_open ()

 
GgitRepository *
-ggit_repository_open (GFile *location,
-                      GError **error);

+ggit_repository_open (GFile *location,
+                      GError **error);
 
Open a git repository.

 
The path
  must point to an existing git repository folder, e.g.

@@ -716,7 +716,7 @@
 
 

-
+
@@ -732,9 +732,9 @@
 

 
ggit_repository_init_repository ()

 
GgitRepository *
-ggit_repository_init_repository (GFile *location,
-                                 gboolean is_bare,
-                                 GError **error);

+ggit_repository_init_repository (GFile *location,
+                                 gboolean is_bare,
+                                 GError **error);
 
Creates a new git repository in the given folder.

 

 
Parameters

@@ -752,14 +752,14 @@
 
 

-
-
+
@@ -775,10 +775,10 @@
 

 
ggit_repository_clone ()

 
GgitRepository *
-ggit_repository_clone (const gchar *url,
-                       GFile *location,
+ggit_repository_clone (const gchar *url,
+                       GFile *location,
                        GgitCloneOptions *options,
-                       GError **error);

+                       GError **error);
 
Clones a new git repository in the given folder.

 

 
Parameters

@@ -806,7 +806,7 @@
 
 

-
+
@@ -824,15 +824,15 @@
 
GgitObject *
 ggit_repository_lookup (GgitRepository *repository,
                         GgitOId *oid,
-                        GType gtype,
-                        GError **error);

+                        GType gtype,
+                        GError **error);
Lookups a reference to one of the objects in the repository
 .

-
The generated reference must be freed with g_object_unref().

+
The generated reference must be freed with g_object_unref().
The gtype
  must match the type of the object
 in the odb; the method will fail otherwise.
-The special value G_TYPE_NONE may be passed to let
+The special value G_TYPE_NONE may be passed to let
 the method guess the object's type.

 
Parameters

@@ -855,12 +855,12 @@
 
 

-
+
-
+
@@ -868,7 +868,7 @@
 

 
Returns

-
 the found GgitObject, or NULL on error. 

+
 the found GgitObject, or NULL on error. 

 
[transfer full]

 

@@ -877,11 +877,11 @@
 
ggit_repository_lookup_reference ()
GgitRef *
 ggit_repository_lookup_reference (GgitRepository *repository,
-                                  const gchar *name,
-                                  GError **error);

+                                  const gchar *name,
+                                  GError **error);
Lookups a reference by its name in repository
 . The returned GgitRef must
-be freed with g_object_unref().

+be freed with g_object_unref().

 
Parameters

 

 
 
 
 
 
const gchar *
+const gchar *
 
 
 ggit_ref_spec_get_source ()
 
 

 
const gchar *
+const gchar *
 
 
 ggit_ref_spec_get_destination ()
@@ -72,7 +72,7 @@
 

 

 
-gboolean
+gboolean
 
 
 ggit_ref_spec_is_forced ()
@@ -96,7 +96,7 @@
 
 

 
Object Hierarchy

-
    GBoxed
+
    GBoxed
     ╰── GgitRefSpec
 

 

@@ -160,7 +160,7 @@
 

 

 
ggit_ref_spec_get_source ()

-
const gchar *
+
const gchar *
 ggit_ref_spec_get_source (GgitRefSpec *refspec);

 
Gets the refspec
 's source.

@@ -187,7 +187,7 @@
 

 

 
ggit_ref_spec_get_destination ()

-
const gchar *
+
const gchar *
 ggit_ref_spec_get_destination (GgitRefSpec *refspec);

 
Gets the refspec
 's destination.

@@ -214,7 +214,7 @@
 

 

 
ggit_ref_spec_is_forced ()

-
gboolean
+
gboolean
 ggit_ref_spec_is_forced (GgitRefSpec *refspec);

 
Whether updating is done forcefully.

 

diff -Nru libgit2-glib-0.23.10/docs/reference/html/GgitRemote.html libgit2-glib-0.24.0/docs/reference/html/GgitRemote.html
--- libgit2-glib-0.23.10/docs/reference/html/GgitRemote.html	2016-02-05 16:21:09.000000000 +0000
+++ libgit2-glib-0.24.0/docs/reference/html/GgitRemote.html	2016-03-14 23:14:08.000000000 +0000
@@ -42,7 +42,7 @@
 

 

 
-gint
+gint
 
 
 (*GgitRemoteListCallback) ()
@@ -57,14 +57,14 @@
 
 

 
const gchar *
+const gchar *
 
 
 ggit_remote_get_name ()
 
 

 
const gchar *
+const gchar *
 
 
 ggit_remote_get_url ()
@@ -80,7 +80,7 @@
 

 

 
-gboolean
+gboolean
 
 
 ggit_remote_get_connected ()
@@ -111,7 +111,7 @@
 
 

 
const gchar *
+const gchar *
 
 
 ggit_remote_head_get_name ()
@@ -127,7 +127,7 @@
 

 

 
-GType
+GType
 
 
 ggit_remote_head_get_type ()
@@ -135,7 +135,7 @@
 

 

 
-gboolean
+gboolean
 
 
 ggit_remote_head_is_local ()
@@ -185,11 +185,11 @@
 
 

 
Object Hierarchy

-
    GBoxed
+
    GBoxed
     ╰── GgitRemoteHead
-    GEnum
+    GEnum
     ╰── GgitRemoteDownloadTagsType
-    GObject
+    GObject
     ╰── GgitObjectFactoryBase
         ╰── GgitNative
             ╰── GgitRemote
@@ -202,12 +202,12 @@
 
Functions

 

 
GgitRemoteListCallback ()

-
gint
-(*GgitRemoteListCallback) (const gchar *name,
+
gint
+(*GgitRemoteListCallback) (const gchar *name,
                            GgitOId *oid,
                            GgitOId *loid,
-                           gboolean local,
-                           gpointer user_data);

+                           gboolean local,
+                           gpointer user_data);

 
The type of the callback functions for listing the references of a
 GgitRemote. See ggit_remote_list().

 

@@ -257,9 +257,9 @@
 
ggit_remote_new ()

 
GgitRemote *
 ggit_remote_new (GgitRepository *repository,
-                 const gchar *name,
-                 const gchar *url,
-                 GError **error);

+                 const gchar *name,
+                 const gchar *url,
+                 GError **error);

 
Creates a remote with the default refspecs in memory. You can use
 this when you have a URL instead of a remote's name.

 

@@ -288,7 +288,7 @@
 

 

 
error
a GError for error reporting, or NULL.
a GError for error reporting, or NULL.

  
 

 
 
 
 

 
custom_headers
 extra HTTP headers to use in this connection. 
[allow-none]

 
error
a GError for error reporting, or NULL.
a GError for error reporting, or NULL.

  
 

 
 
 
 
 
 
 
 

 
error
a GError for error reporting, or NULL.
a GError for error reporting, or NULL.

  
 

 
 
 

 
-gint
+gint
 
 
 (*GgitReferencesNameCallback) ()
@@ -52,7 +52,7 @@
 

 

 
-gint
+gint
 
 
 (*GgitStashCallback) ()
@@ -60,7 +60,7 @@
 

 

 
-gint
+gint
 
 
 (*GgitStatusCallback) ()
@@ -220,7 +220,7 @@
 

 

 
-gchar **
+gchar **
 
 
 ggit_repository_list_tags ()
@@ -260,7 +260,7 @@
 

 

 
-gchar **
+gchar **
 
 
 ggit_repository_list_remotes ()
@@ -276,7 +276,7 @@
 

 

 
-GFile *
+GFile *
 
 
 ggit_repository_discover ()
@@ -284,7 +284,7 @@
 

 

 
-gboolean
+gboolean
 
 
 ggit_repository_is_head_detached ()
@@ -292,7 +292,7 @@
 

 

 
-gboolean
+gboolean
 
 
 ggit_repository_is_head_unborn ()
@@ -300,7 +300,7 @@
 

 

 
-gboolean
+gboolean
 
 
 ggit_repository_is_empty ()
@@ -308,7 +308,7 @@
 

 

 
-GFile *
+GFile *
 
 
 ggit_repository_get_location ()
@@ -316,7 +316,7 @@
 

 

 
-GFile *
+GFile *
 
 
 ggit_repository_get_workdir ()
@@ -332,7 +332,7 @@
 

 

 
-gboolean
+gboolean
 
 
 ggit_repository_is_bare ()
@@ -348,7 +348,7 @@
 

 

 
-gboolean
+gboolean
 
 
 ggit_repository_file_status_foreach ()
@@ -356,7 +356,7 @@
 

 

 
-gboolean
+gboolean
 
 
 ggit_repository_references_foreach_name ()
@@ -388,7 +388,7 @@
 

 

 
-gboolean
+gboolean
 
 
 ggit_repository_submodule_foreach ()
@@ -428,7 +428,7 @@
 

 

 
-gboolean
+gboolean
 
 
 ggit_repository_stash_foreach ()
@@ -467,30 +467,30 @@
 Read
 

 
gbooleangboolean
 init
 Read / Write / Construct Only
 

 
gbooleangboolean
 is-bare
 Read / Write / Construct Only
 

 

 
-GFile *
 location
 Read / Write / Construct Only
 

 

 
-gchar *
 url
 Read / Write / Construct Only
 

 

 
-GFile *
 workdir
 Read / Write / Construct
 

 
 

 
error
a GError for error reporting, or NULL.
a GError for error reporting, or NULL.

  
 

 

 
is_bare
if TRUE, a git repository without a working directory is created
-at the pointed path. If FALSE, provided path will be considered as the working
+
if TRUE, a git repository without a working directory is created
+at the pointed path. If FALSE, provided path will be considered as the working
 directory into which the .git directory will be created.

  
 

 

 
error
a GError for error reporting, or NULL.
a GError for error reporting, or NULL.

  
 

 

 
error
a GError for error reporting, or NULL.
a GError for error reporting, or NULL.

  
 

 
 
 
 

 
gtype
a GType.
a GType.

  
 

 

 
error
a GError for error reporting, or NULL.
a GError for error reporting, or NULL.

  
 

 
 
 
 
 
 

@@ -903,7 +903,7 @@
 
-
+
@@ -920,13 +920,13 @@
 
ggit_repository_create_reference ()
GgitRef *
 ggit_repository_create_reference (GgitRepository *repository,
-                                  const gchar *name,
+                                  const gchar *name,
                                   GgitOId *oid,
-                                  const gchar *log_message,
-                                  GError **error);

+                                  const gchar *log_message,
+                                  GError **error);
Creates a new object id reference.
The reference will be created in the repository and written
-to the disk. The returned value must be freed with g_object_unref().

+to the disk. The returned value must be freed with g_object_unref().

 
Parameters

 

 

 
error
a GError for error reporting, or NULL.
a GError for error reporting, or NULL.

  
 

 
 
 
 
 

@@ -958,7 +958,7 @@
 
-
+
@@ -976,13 +976,13 @@
 
GgitRef *
 ggit_repository_create_symbolic_reference
                                (GgitRepository *repository,
-                                const gchar *name,
-                                const gchar *target,
-                                const gchar *log_message,
-                                GError **error);

+                                const gchar *name,
+                                const gchar *target,
+                                const gchar *log_message,
+                                GError **error);
Creates a new symbolic reference.
The reference will be created in the repository and written
-to the disk. The returned value must be freed with g_object_unref().

+to the disk. The returned value must be freed with g_object_unref().

 
Parameters

 

 

 
error
a GError for error reporting, or NULL.
a GError for error reporting, or NULL.

  
 

 
 
 
 

@@ -1014,7 +1014,7 @@
 
-
+
@@ -1031,7 +1031,7 @@
 
ggit_repository_create_blob ()
GgitBlobOutputStream *
 ggit_repository_create_blob (GgitRepository *repository);

-
Create a new blob and return a GOutputStream to write contents to the blob.
+
Create a new blob and return a GOutputStream to write contents to the blob.
 This is an efficient way to create new blobs without copying data. The
 blob id can be obtained from the blob output stream using
 ggit_blob_output_stream_get_id, after you close the stream.

@@ -1062,9 +1062,9 @@
 
GgitOId *
 ggit_repository_create_blob_from_buffer
                                (GgitRepository *repository,
-                                gconstpointer buffer,
-                                gsize size,
-                                GError **error);

+                                gconstpointer buffer,
+                                gsize size,
+                                GError **error);
Write an in-memory buffer to the object database as a blob.

 
Parameters

@@ -1092,7 +1092,7 @@
 
 

-
+
@@ -1100,7 +1100,7 @@
 

 
Returns

-
 the new GgitOid of the written blob, or NULL if writing the blob
+
 the new GgitOid of the written blob, or NULL if writing the blob
 failed.

 

@@ -1109,8 +1109,8 @@
 
ggit_repository_create_blob_from_file ()
GgitOId *
 ggit_repository_create_blob_from_file (GgitRepository *repository,
-                                       GFile *file,
-                                       GError **error);

+                                       GFile *file,
+                                       GError **error);
Write a file to the object database as a blob.

 
Parameters

@@ -1128,12 +1128,12 @@
 
 

-
+
-
+
@@ -1141,7 +1141,7 @@
 

 
Returns

-
 the new GgitOid of the written blob, or NULL if writing the blob
+
 the new GgitOid of the written blob, or NULL if writing the blob
 failed.

 

@@ -1150,8 +1150,8 @@
 
ggit_repository_create_blob_from_path ()
GgitOId *
 ggit_repository_create_blob_from_path (GgitRepository *repository,
-                                       const gchar *path,
-                                       GError **error);

+                                       const gchar *path,
+                                       GError **error);
Write a path relative to the repository working directory to the object
 database as a blob.

@@ -1175,7 +1175,7 @@
 
 

-
+
@@ -1183,7 +1183,7 @@
 

 
Returns

-
 the new GgitOid of the written blob, or NULL if writing the blob
+
 the new GgitOid of the written blob, or NULL if writing the blob
 failed.

 

@@ -1192,21 +1192,21 @@
 
ggit_repository_create_commit ()
GgitOId *
 ggit_repository_create_commit (GgitRepository *repository,
-                               const gchar *update_ref,
+                               const gchar *update_ref,
                                GgitSignature *author,
                                GgitSignature *committer,
-                               const gchar *message_encoding,
-                               const gchar *message,
+                               const gchar *message_encoding,
+                               const gchar *message,
                                GgitTree *tree,
                                GgitCommit **parents,
-                               gint parent_count,
-                               GError **error);

+                               gint parent_count,
+                               GError **error);
Create a new commit. If update_ref
- is not NULL, the given reference will
+ is not NULL, the given reference will
 be updated to point to the newly created commit. Use "HEAD" to update the
 HEAD of the current branch and make it point to this commit.
If message_encoding
- is set to NULL, "UTF-8" encoding is assumed for the
+ is set to NULL, "UTF-8" encoding is assumed for the
 provided message
 . Note that message
  will not be cleaned up automatically.
@@ -1268,7 +1268,7 @@
 
 

-
+
@@ -1276,7 +1276,7 @@
 

 
Returns

-
 the GgitOId of the created commit object, or NULL in case of an error.

+
 the GgitOId of the created commit object, or NULL in case of an error.

 

@@ -1284,12 +1284,12 @@
 
ggit_repository_create_tag ()
GgitOId *
 ggit_repository_create_tag (GgitRepository *repository,
-                            const gchar *tag_name,
+                            const gchar *tag_name,
                             GgitObject *target,
                             GgitSignature *tagger,
-                            const gchar *message,
+                            const gchar *message,
                             GgitCreateFlags flags,
-                            GError **error);

+                            GError **error);
Create a new tag object.

 
Parameters

@@ -1332,7 +1332,7 @@
 
 

-
+
@@ -1341,7 +1341,7 @@
 

 
Returns

 
 the id to which the tag points, or
-NULL in case of an error. 

+NULL in case of an error. 

 
[transfer full][allow-none]

 

@@ -1351,9 +1351,9 @@
 
GgitOId *
 ggit_repository_create_tag_from_buffer
                                (GgitRepository *repository,
-                                const gchar *tag,
+                                const gchar *tag,
                                 GgitCreateFlags flags,
-                                GError **error);

+                                GError **error);
Create a new tag from a buffer describing the tag object. The buffer must
 be correctly formatted.

@@ -1382,7 +1382,7 @@
 
 

-
+
@@ -1391,7 +1391,7 @@
 

 
Returns

 
 the id to which the tag points, or
-NULL in case of an error. 

+NULL in case of an error. 

 
[transfer full][allow-none]

 

@@ -1401,10 +1401,10 @@
 
GgitOId *
 ggit_repository_create_tag_lightweight
                                (GgitRepository *repository,
-                                const gchar *tag_name,
+                                const gchar *tag_name,
                                 GgitObject *target,
                                 GgitCreateFlags flags,
-                                GError **error);

+                                GError **error);
Creates a new lightweight tag.

 
Parameters

@@ -1437,7 +1437,7 @@
 
 

-
+
@@ -1446,7 +1446,7 @@
 

 
Returns

 
 the id to which the tag points, or
-NULL in case of an error. 

+NULL in case of an error. 

 
[transfer full][allow-none]

 

@@ -1455,7 +1455,7 @@
 
ggit_repository_create_tree_builder ()
GgitTreeBuilder *
 ggit_repository_create_tree_builder (GgitRepository *repository,
-                                     GError **error);

+                                     GError **error);
Create a new tree builder.

 
Parameters

@@ -1473,7 +1473,7 @@
 
 

-
+
@@ -1481,7 +1481,7 @@
 

 
Returns

-
 a new GgitTreeBuilder, or NULL if there was an error. 

+
 a new GgitTreeBuilder, or NULL if there was an error. 

 
[transfer full]

 

@@ -1492,7 +1492,7 @@
 ggit_repository_create_tree_builder_from_tree
                                (GgitRepository *repository,
                                 GgitTree *tree,
-                                GError **error);
+                                GError **error);
Create a tree builder for initialized with tree
 . To create an empty
 tree builder, use ggit_repository_create_tree_builder instead.

@@ -1512,7 +1512,7 @@
 
-
+
@@ -1520,7 +1520,7 @@
 

 
Returns

-
 a new GgitTreeBuilder object, or NULL if there was an error. 

+
 a new GgitTreeBuilder object, or NULL if there was an error. 

 
[transfer full]

 

@@ -1530,11 +1530,11 @@
 
GgitIndexEntry *
 ggit_repository_create_index_entry_for_file
                                (GgitRepository *repository,
-                                GFile *file,
+                                GFile *file,
                                 GgitOId *id,
-                                GError **error);

+                                GError **error);
Create a new index entry. When file
- is not NULL, the path of the returned
+ is not NULL, the path of the returned
 entry (ggit_index_entry_get_path) is set to the path of file
  relative to
 the working directory of repository
@@ -1543,7 +1543,7 @@
 . The file related
 fields of the returned entry are also queried from this file (if the file exists).
If id
- is not NULL, then the id of the returned entry is set to id
+ is not NULL, then the id of the returned entry is set to id
 
 (see ggit_index_entry_get_id) which could point to a blob (for a file)
 or a tree (for a directory).

@@ -1563,7 +1563,7 @@
 
-
+
@@ -1573,7 +1573,7 @@
 
-
+
@@ -1581,7 +1581,7 @@
 

 
Returns

-
 a GgitIndexEntry or NULL when an error occurred.

+
 a GgitIndexEntry or NULL when an error occurred.

 

@@ -1590,11 +1590,11 @@
 
GgitIndexEntry *
 ggit_repository_create_index_entry_for_path
                                (GgitRepository *repository,
-                                const gchar *path,
+                                const gchar *path,
                                 GgitOId *id,
-                                GError **error);

+                                GError **error);
Create a new index entry. When path
- is not NULL, the path of the returned
+ is not NULL, the path of the returned
 entry (ggit_index_entry_get_path) is set path
 . The specified path can be
 either absolute or relative. In the case of
@@ -1603,7 +1603,7 @@
 . The file related fields of the returned entry are also queried
 from this path (if the file exists).
If id
- is not NULL, then the id of the returned entry is set to id
+ is not NULL, then the id of the returned entry is set to id
 
 (see ggit_index_entry_get_id) which could point to a blob (for a file)
 or a tree (for a directory).

@@ -1633,7 +1633,7 @@
 
-
+
@@ -1641,15 +1641,15 @@
 

 
Returns

-
 a GgitIndexEntry or NULL when an error occurred.

+
 a GgitIndexEntry or NULL when an error occurred.

 

 
ggit_repository_list_tags ()

-
gchar **
+
gchar **
 ggit_repository_list_tags (GgitRepository *repository,
-                           GError **error);

+                           GError **error);

 
Fill a list with all the tags in the repository
 .

 

@@ -1668,7 +1668,7 @@
 
 

-
+
@@ -1686,10 +1686,10 @@
 
ggit_repository_create_branch ()
GgitBranch *
 ggit_repository_create_branch (GgitRepository *repository,
-                               const gchar *branch_name,
+                               const gchar *branch_name,
                                GgitObject *target,
                                GgitCreateFlags flags,
-                               GError **error);

+                               GError **error);
Creates a new branch pointing at a target commit.

 
Parameters

@@ -1722,7 +1722,7 @@
 
 

-
+
@@ -1731,7 +1731,7 @@
 

 
Returns

 
 the reference to which the branch
-points, or NULL in case of an error. 

+points, or NULL in case of an error. 

 
[transfer full][allow-none]

 

@@ -1741,7 +1741,7 @@
 
GgitBranchEnumerator *
 ggit_repository_enumerate_branches (GgitRepository *repository,
                                     GgitBranchType list_type,
-                                    GError **error);

+                                    GError **error);
Get a branch enumerator to enumerate over all branches of the specified
 list_type
  in repository
@@ -1767,7 +1767,7 @@
 
 

-
+
@@ -1784,9 +1784,9 @@
 
ggit_repository_lookup_branch ()
GgitBranch *
 ggit_repository_lookup_branch (GgitRepository *repository,
-                               const gchar *branch_name,
+                               const gchar *branch_name,
                                GgitBranchType branch_type,
-                               GError **error);

+                               GError **error);
Lookups a branch by its name in a repository.

 
Parameters

@@ -1814,7 +1814,7 @@
 
 

-
+
@@ -1831,9 +1831,9 @@
 
ggit_repository_create_remote ()
GgitRemote *
 ggit_repository_create_remote (GgitRepository *repository,
-                               const gchar *name,
-                               const gchar *url,
-                               GError **error);

+                               const gchar *name,
+                               const gchar *url,
+                               GError **error);
Adds a remote with the default fetch refspec to the repository's configuration.

 
Parameters

@@ -1861,7 +1861,7 @@
 
 

-
+
@@ -1869,16 +1869,16 @@
 

 
Returns

-
 a new GgitRemote or NULL if there is an error. 

+
 a new GgitRemote or NULL if there is an error. 

 
[transfer full][allow-none]

 

 
ggit_repository_list_remotes ()

-
gchar **
+
gchar **
 ggit_repository_list_remotes (GgitRepository *repository,
-                              GError **error);

+                              GError **error);

 
Fill a list with all the remotes in repository
 .

 

@@ -1897,7 +1897,7 @@
 
 

-
+
@@ -1914,7 +1914,7 @@
 
ggit_repository_get_head ()
GgitRef *
 ggit_repository_get_head (GgitRepository *repository,
-                          GError **error);

+                          GError **error);
Get and resolves the current HEAD reference of the repository. Note that the
 returned ref is already resolved (if HEAD is symbolic). If you want to
 retrieve the symbolic ref called HEAD, then use ggit_repository_lookup_reference
@@ -1935,7 +1935,7 @@
 
 

-
+
@@ -1950,9 +1950,9 @@
 

 
ggit_repository_discover ()

-
GFile *
-ggit_repository_discover (GFile *location,
-                          GError **error);

+
GFile *
+ggit_repository_discover (GFile *location,
+                          GError **error);

 
Looks for a git repository.

 
The lookup starts from path
  and walks up the parent directories
@@ -1973,7 +1973,7 @@
 
 

-
+
@@ -1988,9 +1988,9 @@
 

 
ggit_repository_is_head_detached ()

-
gboolean
+
gboolean
 ggit_repository_is_head_detached (GgitRepository *repository,
-                                  GError **error);

+                                  GError **error);

 
Checks if repository
 's HEAD is detached.

 
A repository's HEAD is detached when it points directly to a commit
@@ -2011,7 +2011,7 @@
 
 

-
+
@@ -2019,15 +2019,15 @@
 

 
Returns

-
 TRUE if HEAD is detached.

+
 TRUE if HEAD is detached.

 

 
ggit_repository_is_head_unborn ()

-
gboolean
+
gboolean
 ggit_repository_is_head_unborn (GgitRepository *repository,
-                                GError **error);

+                                GError **error);

 
Checks if repository
 's HEAD is an orphan.

 
An orphan branch is one named from HEAD but doesn't exist in
@@ -2048,7 +2048,7 @@
 
 

-
+
@@ -2056,15 +2056,15 @@
 

 
Returns

-
 TRUE if the current branch is an orphan.

+
 TRUE if the current branch is an orphan.

 

 
ggit_repository_is_empty ()

-
gboolean
+
gboolean
 ggit_repository_is_empty (GgitRepository *repository,
-                          GError **error);

+                          GError **error);

 
Checks if repository
  is empty.

 
An empty repository has just been initialized and contains
@@ -2085,7 +2085,7 @@
 
 

-
+
@@ -2093,13 +2093,13 @@
 

 
Returns

-
 TRUE if the repository is empty.

+
 TRUE if the repository is empty.

 

 
ggit_repository_get_location ()

-
GFile *
+
GFile *
 ggit_repository_get_location (GgitRepository *repository);

 
Get the gitdir location of the repository.

 

@@ -2126,7 +2126,7 @@
 

 

 
ggit_repository_get_workdir ()

-
GFile *
+
GFile *
 ggit_repository_get_workdir (GgitRepository *repository);

 
Gets the working directory of the repository.

 

@@ -2155,11 +2155,11 @@
 
ggit_repository_set_workdir ()

 
void
 ggit_repository_set_workdir (GgitRepository *repository,
-                             GFile *workdir,
-                             gboolean update_gitlink);

+                             GFile *workdir,
+                             gboolean update_gitlink);

 
Sets the working directory of the repository. If update_gitlink
  is set to
-TRUE "core.worktree" will be set in the config if workdir is not the parent
+TRUE "core.worktree" will be set in the config if workdir is not the parent
 of the .git directory).

 

 
Parameters

@@ -2192,7 +2192,7 @@
 

 

 
ggit_repository_is_bare ()

-
gboolean
+
gboolean
 ggit_repository_is_bare (GgitRepository *repository);

 
Checks if repository
  is bare.

@@ -2213,7 +2213,7 @@
 

 

 
Returns

-
 TRUE if the repository is empty.

+
 TRUE if the repository is empty.

 

 

 

@@ -2221,8 +2221,8 @@
 
ggit_repository_file_status ()

 
GgitStatusFlags
 ggit_repository_file_status (GgitRepository *repository,
-                             GFile *location,
-                             GError **error);

+                             GFile *location,
+                             GError **error);

 
Gets the file status for a single file.

 

 
Parameters

@@ -2245,7 +2245,7 @@
 
 

-
+
@@ -2259,19 +2259,19 @@
 

 
ggit_repository_file_status_foreach ()

-
gboolean
+
gboolean
 ggit_repository_file_status_foreach (GgitRepository *repository,
                                      GgitStatusOptions *options,
                                      GgitStatusCallback callback,
-                                     gpointer user_data,
-                                     GError **error);

+                                     gpointer user_data,
+                                     GError **error);

 
Gathers file statuses and run a callback for each one.

 
To the callback is passed the path of the file, the status and the data pointer
 passed to this function. If the callback returns something other than
 0, the iteration will stop and error
  will be set.

 
Set options
- to NULL to get the default status options.

+ to NULL to get the default status options.

 

 
Parameters

 

 

 
error
a GError for error reporting, or NULL.
a GError for error reporting, or NULL.

  
 

 
 
 
 

 
error
a GError for error reporting, or NULL.
a GError for error reporting, or NULL.

  
 

 
 
 
 
 
 

 
file
a GFile.
a GFile.

  
 

 

 
error
a GError for error reporting, or NULL.
a GError for error reporting, or NULL.

  
 

 
 
 
 
 
 

 
error
a GError for error reporting, or NULL.
a GError for error reporting, or NULL.

  
 

 
 
 
 
 
 

 
error
a GError for error reporting, or NULL.
a GError for error reporting, or NULL.

  
 

 
 
 
 
 
 
 

 
error
a GError for error reporting, or NULL.
a GError for error reporting, or NULL.

  
 

 
 
 
 

 
error
a GError for error reporting, or NULL.
a GError for error reporting, or NULL.

  
 

 
 
 
 

 
error
a GError for error reporting, or NULL.
a GError for error reporting, or NULL.

  
 

 
 
 
 
 

 
error
a GError for error reporting, or NULL.
a GError for error reporting, or NULL.

  
 

 
 
 
 
 

 
error
a GError for error reporting, or NULL.
a GError for error reporting, or NULL.

  
 

 
 
 
 
 
 

 
file
 a GFile. 
 a GFile. 

 [allow-none]
 

 

 

 
error
a GError for error reporting, or NULL.
a GError for error reporting, or NULL.

  
 

 
 
 
 
 
 
 

 
error
a GError for error reporting, or NULL.
a GError for error reporting, or NULL.

  
 

 
 
 
 
 

 
error
a GError for error reporting, or NULL.
a GError for error reporting, or NULL.

  
 

 
 
 
 

 
error
a GError for error reporting, or NULL.
a GError for error reporting, or NULL.

  
 

 
 
 

 
error
a GError for error reporting, or NULL.
a GError for error reporting, or NULL.

  
 

 
 
 
 

 
error
a GError for error reporting, or NULL.
a GError for error reporting, or NULL.

  
 

 
 
 
 

 
error
a GError for error reporting, or NULL.
a GError for error reporting, or NULL.

  
 

 
 
 
 
 

 
error
a GError for error reporting, or NULL.
a GError for error reporting, or NULL.

  
 

 
 
 

 
error
a GError for error reporting, or NULL.
a GError for error reporting, or NULL.

  
 

 
 

 
error
a GError for error reporting, or NULL.
a GError for error reporting, or NULL.

  
 

 
 

 
error
a GError for error reporting, or NULL.
a GError for error reporting, or NULL.

  
 

 
 
 
 
 

 
error
a GError for error reporting, or NULL.
a GError for error reporting, or NULL.

  
 

 
 
 
 
 

 
error
a GError for error reporting, or NULL.
a GError for error reporting, or NULL.

  
 

 
 
 
 
 

 
error
a GError for error reporting, or NULL.
a GError for error reporting, or NULL.

  
 

 
 

@@ -2288,7 +2288,7 @@
 
-
+
@@ -2303,7 +2303,7 @@
 
-
+
@@ -2311,18 +2311,18 @@
 

 
Returns

-
 TRUE if there was no error, FALSE otherwise

+
 TRUE if there was no error, FALSE otherwise

 

 
ggit_repository_references_foreach_name ()

-
gboolean
+
gboolean
 ggit_repository_references_foreach_name
                                (GgitRepository *repository,
                                 GgitReferencesNameCallback callback,
-                                gpointer user_data,
-                                GError **error);

+                                gpointer user_data,
+                                GError **error);

 
Gathers reference names and run a callback for each one.

 
To the callback is passed the name of the reference and the data pointer
 passed to this function. If the callback returns something other than
@@ -2354,7 +2354,7 @@
 
 

-
+
@@ -2362,7 +2362,7 @@
 

 
Returns

-
 TRUE if there was no error, FALSE otherwise

+
 TRUE if there was no error, FALSE otherwise

 

@@ -2370,7 +2370,7 @@
 
ggit_repository_get_config ()
GgitConfig *
 ggit_repository_get_config (GgitRepository *repository,
-                            GError **error);

+                            GError **error);
Get the config for a specific repository.

 
Parameters

@@ -2388,7 +2388,7 @@
 
 

-
+
@@ -2405,7 +2405,7 @@
 
ggit_repository_get_index ()
GgitIndex *
 ggit_repository_get_index (GgitRepository *repository,
-                           GError **error);

+                           GError **error);
Get the index for a specific repository.

 
Parameters

@@ -2423,7 +2423,7 @@
 
 

-
+
@@ -2440,10 +2440,10 @@
 
ggit_repository_lookup_submodule ()
GgitSubmodule *
 ggit_repository_lookup_submodule (GgitRepository *repository,
-                                  const gchar *name,
-                                  GError **error);

+                                  const gchar *name,
+                                  GError **error);
Lookups a submodule information by name or path. If the submodule
-does not exist, NULL is returned and a GGIT_ERROR_NOTFOUND error set.

+does not exist, NULL is returned and a GGIT_ERROR_NOTFOUND error set.

 
Parameters

 

 

 
options
 status options, or NULL. 
 status options, or NULL. 

 [allow-none]
 

 

 

 
error
a GError for error reporting, or NULL.
a GError for error reporting, or NULL.

  
 

 
 
 
 
 

 
error
a GError for error reporting, or NULL.
a GError for error reporting, or NULL.

  
 

 
 
 
 
 
 
 

 
error
a GError for error reporting, or NULL.
a GError for error reporting, or NULL.

  
 

 
 
 
 

 
error
a GError for error reporting, or NULL.
a GError for error reporting, or NULL.

  
 

 
 
 
 

@@ -2465,7 +2465,7 @@
 
-
+
@@ -2480,11 +2480,11 @@
 

 
ggit_repository_submodule_foreach ()

-
gboolean
+
gboolean
 ggit_repository_submodule_foreach (GgitRepository *repository,
                                    GgitSubmoduleCallback callback,
-                                   gpointer user_data,
-                                   GError **error);

+                                   gpointer user_data,
+                                   GError **error);

 
Gathers submodules and run a callback for each one.

 
To the callback is passed the submodule instance and name. If the callback
 returns something other than 0, the iteration will stop and error
@@ -2519,7 +2519,7 @@
 
 

-
+
@@ -2527,7 +2527,7 @@
 

 
Returns

-
 TRUE if there was no error, FALSE otherwise

+
 TRUE if there was no error, FALSE otherwise

 

@@ -2538,7 +2538,7 @@
                        GgitObject *target,
                        GgitResetType reset_type,
                        GgitCheckoutOptions *checkout_options,
-                       GError **error);
+                       GError **error);
Performs a reset of type reset_type
  on repository
  to target
@@ -2576,7 +2576,7 @@
 
 

-
+
@@ -2588,8 +2588,8 @@
 
ggit_repository_revparse ()
GgitObject *
 ggit_repository_revparse (GgitRepository *repository,
-                          const gchar *spec,
-                          GError **error);

+                          const gchar *spec,
+                          GError **error);
Find an object, as specified by a revision string. See man gitrevisions,
 or the documentation for git rev-parse for information on the syntax
 accepted.

@@ -2614,7 +2614,7 @@
 
-
+
@@ -2622,7 +2622,7 @@
 

 
Returns

-
 a GgitObject or NULL if the revision could not be found. 

+
 a GgitObject or NULL if the revision could not be found. 

 
[transfer full]

 

@@ -2632,9 +2632,9 @@
 
GgitOId *
 ggit_repository_save_stash (GgitRepository *repository,
                             GgitSignature *stasher,
-                            const gchar *message,
+                            const gchar *message,
                             GgitStashFlags flags,
-                            GError **error);

+                            GError **error);
Saves the local modifications to a new stash.
 It returns the commit containing the stashed state.
 This commit is also the target of the direct reference refs/stash.

@@ -2659,7 +2659,7 @@
 
-
+
@@ -2669,7 +2669,7 @@
 
-
+
@@ -2686,8 +2686,8 @@
 
ggit_repository_drop_stash ()
void
 ggit_repository_drop_stash (GgitRepository *repository,
-                            gsize index,
-                            GError **error);

+                            gsize index,
+                            GError **error);
Removes a single stashed state from the stash list.

 
Parameters

@@ -2711,7 +2711,7 @@
 
 

-
+
@@ -2721,11 +2721,11 @@
 

 
ggit_repository_stash_foreach ()

-
gboolean
+
gboolean
 ggit_repository_stash_foreach (GgitRepository *repository,
                                GgitStashCallback callback,
-                               gpointer user_data,
-                               GError **error);

+                               gpointer user_data,
+                               GError **error);

 
Loops over all the stashed states and issue a callback for each one.
 If callback
  returns a non-zero value, this will stop looping.

@@ -2755,7 +2755,7 @@
 
 

-
+
@@ -2763,7 +2763,7 @@
 

 
Returns

-
 TRUE if there was no error, FALSE otherwise.

+
 TRUE if there was no error, FALSE otherwise.

 

@@ -2773,9 +2773,9 @@
 ggit_repository_get_ahead_behind (GgitRepository *repository,
                                   GgitOId *local,
                                   GgitOId *upstream,
-                                  gsize *ahead,
-                                  gsize *behind,
-                                  GError **error);
+                                  gsize *ahead,
+                                  gsize *behind,
+                                  GError **error);
Count the number of unique commits between two commit objects.
There is no need for branches containing the commits to have any
 upstream relationship, but it helps to think of one as a branch and
@@ -2821,7 +2821,7 @@
 
 

-
+
@@ -3081,7 +3081,7 @@
 

 
The “init” property

-
  “init”                     gboolean

+
  “init”                     gboolean

 
Whether to initialize a repository.

 
Flags: Read / Write / Construct Only

 
Default value: FALSE

@@ -3089,7 +3089,7 @@
 

 

 
The “is-bare” property

-
  “is-bare”                  gboolean

+
  “is-bare”                  gboolean

 
Is a bare repository.

 
Flags: Read / Write / Construct Only

 
Default value: FALSE

@@ -3097,14 +3097,14 @@
 

 

 
The “location” property

-
  “location”                 GFile *

+
  “location”                 GFile *

 
The location of the repository.

 
Flags: Read / Write / Construct Only

 

 

 

 
The “url” property

-
  “url”                      gchar *

+
  “url”                      gchar *

 
The URL for cloning a repository.

 
Flags: Read / Write / Construct Only

 
Default value: NULL

@@ -3112,7 +3112,7 @@
 

 

 
The “workdir” property

-
  “workdir”                  GFile *

+
  “workdir”                  GFile *

 
The path to the repository working directory.

 
Flags: Read / Write / Construct

 

diff -Nru libgit2-glib-0.23.10/docs/reference/html/GgitRevisionWalker.html libgit2-glib-0.24.0/docs/reference/html/GgitRevisionWalker.html
--- libgit2-glib-0.23.10/docs/reference/html/GgitRevisionWalker.html	2016-02-05 16:21:09.000000000 +0000
+++ libgit2-glib-0.24.0/docs/reference/html/GgitRevisionWalker.html	2016-03-14 23:14:08.000000000 +0000
@@ -198,9 +198,9 @@
 

 

 
Object Hierarchy

-
    GFlags
+
    GFlags
     ╰── GgitSortMode
-    GObject
+    GObject
     ╰── GgitObjectFactoryBase
         ╰── GgitNative
             ╰── GgitRevisionWalker
@@ -210,7 +210,7 @@
 
Implemented Interfaces

 

 GgitRevisionWalker implements
- GInitable.

+ GInitable.

 

 

 
Description

@@ -221,7 +221,7 @@
 
ggit_revision_walker_new ()

 
GgitRevisionWalker *
 ggit_revision_walker_new (GgitRepository *repository,
-                          GError **error);

+                          GError **error);
 
Creates a new revision walker to iterate through repository
 .

 
This revision walker uses a custom memory pool and an internal
@@ -248,7 +248,7 @@
 
 

-
+
@@ -294,7 +294,7 @@
 
void
 ggit_revision_walker_push (GgitRevisionWalker *walker,
                            GgitOId *oid,
-                           GError **error);

+                           GError **error);
Marks a commit to start traversal from.
The given OID must belong to a commit on the walked
 repository.

@@ -323,7 +323,7 @@
 
-
+
@@ -336,7 +336,7 @@
 
void
 ggit_revision_walker_hide (GgitRevisionWalker *walker,
                            GgitOId *oid,
-                           GError **error);

+                           GError **error);
Marks a commit (and its ancestors) uninteresting for the output.
The given OID must belong to a commit on the walked
 repository.

@@ -363,7 +363,7 @@
 
-
+
@@ -375,8 +375,8 @@
 
ggit_revision_walker_hide_glob ()
void
 ggit_revision_walker_hide_glob (GgitRevisionWalker *walker,
-                                const gchar *item,
-                                GError **error);

+                                const gchar *item,
+                                GError **error);
Hide all OIDs pointed to by references that match the given glob pattern
 to the revsision walker. A leading 'refs/' is implied if not present, as well
 as a trailing '/ \ *' if the glob lacks '?', '\ *' or '['.

@@ -401,7 +401,7 @@
 
-
+
@@ -413,7 +413,7 @@
 
ggit_revision_walker_hide_head ()
void
 ggit_revision_walker_hide_head (GgitRevisionWalker *walker,
-                                GError **error);

+                                GError **error);
Hide the OID of the current HEAD to the revision walker.

 
Parameters

@@ -431,7 +431,7 @@
 
 

-
+
@@ -443,8 +443,8 @@
 
ggit_revision_walker_hide_ref ()
void
 ggit_revision_walker_hide_ref (GgitRevisionWalker *walker,
-                               const gchar *item,
-                               GError **error);

+                               const gchar *item,
+                               GError **error);
Hide the OID pointed to by the named reference to the revision walker.

 
Parameters

@@ -467,7 +467,7 @@
 
 

-
+
@@ -479,8 +479,8 @@
 
ggit_revision_walker_push_glob ()
void
 ggit_revision_walker_push_glob (GgitRevisionWalker *walker,
-                                const gchar *item,
-                                GError **error);

+                                const gchar *item,
+                                GError **error);
Push all OIDs pointed to by references that match the given glob pattern
 to the revsision walker. A leading 'refs/' is implied if not present, as well
 as a trailing '/ \ *' if the glob lacks '?', '\ *' or '['.

@@ -505,7 +505,7 @@
 
-
+
@@ -517,7 +517,7 @@
 
ggit_revision_walker_push_head ()
void
 ggit_revision_walker_push_head (GgitRevisionWalker *walker,
-                                GError **error);

+                                GError **error);
Push the OID of the current HEAD to the revision walker.

 
Parameters

@@ -535,7 +535,7 @@
 
 

-
+
@@ -547,8 +547,8 @@
 
ggit_revision_walker_push_range ()
void
 ggit_revision_walker_push_range (GgitRevisionWalker *walker,
-                                 const gchar *range,
-                                 GError **error);

+                                 const gchar *range,
+                                 GError **error);
Push and hide the respective endpoints of the given range. The range
 should be of the form: &ltcommit&gt..<commit>, where each <commit> is in the
 form accepted by revparse. The left-hand commit will be hidden and the
@@ -574,7 +574,7 @@
 
 

-
+
@@ -586,8 +586,8 @@
 
ggit_revision_walker_push_ref ()
void
 ggit_revision_walker_push_ref (GgitRevisionWalker *walker,
-                               const gchar *item,
-                               GError **error);

+                               const gchar *item,
+                               GError **error);
Push the OID pointed to by the named reference to the revision walker.

 
Parameters

@@ -610,7 +610,7 @@
 
 

-
+
@@ -622,7 +622,7 @@
 
ggit_revision_walker_next ()
GgitOId *
 ggit_revision_walker_next (GgitRevisionWalker *walker,
-                           GError **error);

+                           GError **error);
Gets the next commit from the revision walk.
The initial call to this method is *not* blocking when
 iterating through a repository with a time-sorting mode.

@@ -647,7 +647,7 @@
 
-
+
diff -Nru libgit2-glib-0.23.10/docs/reference/html/GgitSignature.html libgit2-glib-0.24.0/docs/reference/html/GgitSignature.html
--- libgit2-glib-0.23.10/docs/reference/html/GgitSignature.html	2016-02-05 16:21:09.000000000 +0000
+++ libgit2-glib-0.24.0/docs/reference/html/GgitSignature.html	2016-03-14 23:14:08.000000000 +0000
@@ -58,14 +58,14 @@
 
-
-
+gchar *
@@ -121,7 +121,7 @@
 

 
Object Hierarchy

-
    GObject
+
    GObject
     ╰── GgitObjectFactoryBase
         ╰── GgitNative
             ╰── GgitSignature
@@ -135,10 +135,10 @@
 

 
ggit_signature_new ()

 
GgitSignature *
-ggit_signature_new (const gchar *name,
-                    const gchar *email,
-                    GDateTime *signature_time,
-                    GError **error);

+ggit_signature_new (const gchar *name,
+                    const gchar *email,
+                    GDateTime *signature_time,
+                    GError **error);

 
Creates a new GgitSignature. Name and e-mail are assumed to be in UTF-8.

 

 
Parameters

@@ -166,7 +166,7 @@
 
 

-
+
@@ -182,9 +182,9 @@
 

 
ggit_signature_new_now ()

 
GgitSignature *
-ggit_signature_new_now (const gchar *name,
-                        const gchar *email,
-                        GError **error);

+ggit_signature_new_now (const gchar *name,
+                        const gchar *email,
+                        GError **error);
 
Creates a new GgitSignature with a timestamp of 'now'. Name and e-mail are
 assumed to be in UTF-8.

 

@@ -208,7 +208,7 @@
 
 

-
+
@@ -223,7 +223,7 @@
 

 
ggit_signature_get_name ()

-
const gchar *
+
const gchar *
 ggit_signature_get_name (GgitSignature *signature);

 
Gets the name of the person.

 

@@ -249,7 +249,7 @@
 

 

 
ggit_signature_get_email ()

-
const gchar *
+
const gchar *
 ggit_signature_get_email (GgitSignature *signature);

 
Gets the email of the person.

 

@@ -275,7 +275,7 @@
 

 

 
ggit_signature_get_time ()

-
GDateTime *
+
GDateTime *
 ggit_signature_get_time (GgitSignature *signature);

 
Gets the time when the action happened. Note that the time is returned in
 the timezone of the commit (see ggit_signature_get_time_zone).

@@ -303,7 +303,7 @@
 

 

 
ggit_signature_get_time_zone ()

-
GTimeZone *
+
GTimeZone *
 ggit_signature_get_time_zone (GgitSignature *signature);

 
Gets the timezone in which the action happened.

 

@@ -340,7 +340,7 @@
 
Property Details

 

 
The “encoding” property

-
  “encoding”                 gchar *

+
  “encoding”                 gchar *

 
Encoding.

 
Flags: Read / Write / Construct Only

 
Default value: NULL

diff -Nru libgit2-glib-0.23.10/docs/reference/html/GgitSubmodule.html libgit2-glib-0.24.0/docs/reference/html/GgitSubmodule.html
--- libgit2-glib-0.23.10/docs/reference/html/GgitSubmodule.html	2016-02-05 16:21:09.000000000 +0000
+++ libgit2-glib-0.24.0/docs/reference/html/GgitSubmodule.html	2016-03-14 23:14:08.000000000 +0000
@@ -42,7 +42,7 @@
 

-
-
-
-
+

 

 
error
a GError for error reporting, or NULL.
a GError for error reporting, or NULL.

  
 

 
 

 
error
a GError for error reporting, or NULL.
a GError for error reporting, or NULL.

  
 

 
 
 
 
 

 
error
a GError for error reporting, or NULL.
a GError for error reporting, or NULL.

  
 

 
 
 
 

 
error
a GError for error reporting, or NULL.
a GError for error reporting, or NULL.

  
 

 
 
 
 
 

 
message
description along with the stashed state or NULL to be autogenerated.
description along with the stashed state or NULL to be autogenerated.

  
 

 

 

 
error
a GError for error reporting, GGIT_ENOTFOUND if there's nothing to stash or NULL.
a GError for error reporting, GGIT_ENOTFOUND if there's nothing to stash or NULL.

  
 

 
 
 
 

 
error
a GError for error reporting, or NULL.
a GError for error reporting, or NULL.

  
 

 
 

 
error
a GError for error reporting, or NULL.
a GError for error reporting, or NULL.

  
 

 
 
 
 
 
 

 
error
a GError for error reporting, or NULL.
a GError for error reporting, or NULL.

  
 

 
 

 
error
a GError for error reporting, or NULL.
a GError for error reporting, or NULL.

  
 

 
 
 
 

 
error
a GError for error reporting, or NULL.
a GError for error reporting, or NULL.

  
 

 
 
 
 

 
error
a GError for error reporting, or NULL.
a GError for error reporting, or NULL.

  
 

 
 
 
 

 
error
a GError.
a GError.

  
 

 
 
 
 

 
error
a GError.
a GError.

  
 

 
 
 
 

 
error
a GError.
a GError.

  
 

 
 
 
 

 
error
a GError.
a GError.

  
 

 
 
 
 

 
error
a GError.
a GError.

  
 

 
 
 

 
error
a GError.
a GError.

  
 

 
 
 
 

 
error
a GError.
a GError.

  
 

 
 
 
 
 

 
error
a GError for error reporting, or NULL.
a GError for error reporting, or NULL.

  
 

 
 
 
const gchar *
+const gchar *
 
 
 ggit_signature_get_name ()
 
 

 
const gchar *
+const gchar *
 
 
 ggit_signature_get_email ()
@@ -73,7 +73,7 @@
 

 

 
-GDateTime *
+GDateTime *
 
 
 ggit_signature_get_time ()
@@ -81,7 +81,7 @@
 

 

 
-GTimeZone *
+GTimeZone *
 
 
 ggit_signature_get_time_zone ()
@@ -100,7 +100,7 @@
 
 

 
-gchar *
 encoding
 Read / Write / Construct Only
 

 

 
error
a GError for error reporting, or NULL.
a GError for error reporting, or NULL.

  
 

 

 
error
a GError for error reporting, or NULL.
a GError for error reporting, or NULL.

  
 

 
 
 

 
-gint
+gint
 
 
 (*GgitSubmoduleCallback) ()
@@ -73,21 +73,21 @@
 
 

 
const gchar *
+const gchar *
 
 
 ggit_submodule_get_name ()
 
 

 
const gchar *
+const gchar *
 
 
 ggit_submodule_get_path ()
 
 

 
const gchar *
+const gchar *
 
 
 ggit_submodule_get_url ()
@@ -135,7 +135,7 @@
 

 

 
-gboolean
+gboolean
 
 
 ggit_submodule_get_fetch_recurse ()
@@ -197,12 +197,12 @@
 
 

 
Object Hierarchy

-
    GBoxed
+
    GBoxed
     ╰── GgitSubmodule
-    GEnum
+    GEnum
     ├── GgitSubmoduleIgnore
     ╰── GgitSubmoduleUpdate
-    GFlags
+    GFlags
     ╰── GgitSubmoduleStatus
 

 

@@ -213,10 +213,10 @@
 
Functions

 

 
GgitSubmoduleCallback ()

-
gint
+
gint
 (*GgitSubmoduleCallback) (GgitSubmodule *submodule,
-                          const gchar *name,
-                          gpointer user_data);

+                          const gchar *name,
+                          gpointer user_data);

 
The type of the callback functions for retrieving the submodules
 in a GgitRepository. See ggit_repository_submodule_foreach().

 

@@ -335,7 +335,7 @@
 

 

 
ggit_submodule_get_name ()

-
const gchar *
+
const gchar *
 ggit_submodule_get_name (GgitSubmodule *submodule);

 
Gets the name of the submodule from .gitmodules.

 

@@ -361,7 +361,7 @@
 

 

 
ggit_submodule_get_path ()

-
const gchar *
+
const gchar *
 ggit_submodule_get_path (GgitSubmodule *submodule);

 
Gets the path to the submodule from the repo working directory.
 It is almost always the same as the name.
@@ -389,9 +389,9 @@
 

 

 
ggit_submodule_get_url ()

-
const gchar *
+
const gchar *
 ggit_submodule_get_url (GgitSubmodule *submodule);

-
Gets the url for the submodule or NULL if the submodule has been deleted
+
Gets the url for the submodule or NULL if the submodule has been deleted
 but not yet committed.

 

 
Parameters

@@ -418,7 +418,7 @@
 
ggit_submodule_get_index_id ()

 
GgitOId *
 ggit_submodule_get_index_id (GgitSubmodule *submodule);

-
Gets the OID for the submodule in the index or NULL if there is no index.

+
Gets the OID for the submodule in the index or NULL if there is no index.

 

 
Parameters

 

@@ -436,7 +436,7 @@
 

 
Returns

-
 the OID for the submodule in the index or NULL. 

+
 the OID for the submodule in the index or NULL. 

 
[transfer full][allow-none]

 

@@ -473,7 +473,7 @@
 

 
Returns

-
 the OID for the submodule in the current working directory or NULL. 

+
 the OID for the submodule in the current working directory or NULL. 

 
[transfer full][allow-none]

 

@@ -532,7 +532,7 @@
 

 
ggit_submodule_get_fetch_recurse ()

-
gboolean
+
gboolean
 ggit_submodule_get_fetch_recurse (GgitSubmodule *submodule);

 
Gets whether to fetch recursively. See see gitmodules(5) fetchRecurseSubmodules.

 

@@ -560,8 +560,8 @@
 
ggit_submodule_init ()

 
void
 ggit_submodule_init (GgitSubmodule *submodule,
-                     gboolean overwrite,
-                     GError **error);

+                     gboolean overwrite,
+                     GError **error);

 
Just like "git submodule init", this copies information about the
 submodule into ".git/config".  You can use the accessor functions
 above to alter the in-memory git_submodule object and control what
@@ -587,7 +587,7 @@
 
 

-
+
@@ -599,7 +599,7 @@
 
ggit_submodule_sync ()
void
 ggit_submodule_sync (GgitSubmodule *submodule,
-                     GError **error);

+                     GError **error);
Copies the information about the submodules URL into the checked out
 submodule config, acting like "git submodule sync".  This is useful if
 you have altered the URL for the submodule (or it has been altered by a
@@ -620,7 +620,7 @@
 
 

-
+
@@ -632,8 +632,8 @@
 
ggit_submodule_reload ()
void
 ggit_submodule_reload (GgitSubmodule *submodule,
-                       gboolean force,
-                       GError **error);

+                       gboolean force,
+                       GError **error);
Rereads submodule info from config, index, and HEAD.
 Call this if you have reason to believe that it has changed.

@@ -657,7 +657,7 @@
 
 

-
+
diff -Nru libgit2-glib-0.23.10/docs/reference/html/GgitTag.html libgit2-glib-0.24.0/docs/reference/html/GgitTag.html
--- libgit2-glib-0.23.10/docs/reference/html/GgitTag.html	2016-02-05 16:21:09.000000000 +0000
+++ libgit2-glib-0.24.0/docs/reference/html/GgitTag.html	2016-03-14 23:14:08.000000000 +0000
@@ -57,7 +57,7 @@
 
-
-
-
+
@@ -182,7 +182,7 @@
 

 
ggit_tag_get_name ()

-
const gchar *
+
const gchar *
 ggit_tag_get_name (GgitTag *tag);

 
Gets the name of tag
 .

@@ -213,7 +213,7 @@
 ggit_tag_get_tagger (GgitTag *tag);

 
Get the tagger (author) of tag
 . The returned value must be free with
-g_object_unref().

+g_object_unref().

 

 
Parameters

 

 
 
 
 
 

 
error
a GError for error reporting, or NULL.
a GError for error reporting, or NULL.

  
 

 
 
 

 
error
a GError for error reporting, or NULL.
a GError for error reporting, or NULL.

  
 

 
 
 
 

 
error
a GError for error reporting, or NULL.
a GError for error reporting, or NULL.

  
 

 
 
 
const gchar *
+const gchar *
 
 
 ggit_tag_get_name ()
@@ -72,7 +72,7 @@
 
 

 
const gchar *
+const gchar *
 
 
 ggit_tag_get_message ()
@@ -102,7 +102,7 @@
 
 

 
Object Hierarchy

-
    GObject
+
    GObject
     ╰── GgitObjectFactoryBase
         ╰── GgitNative
             ╰── GgitObject
@@ -118,7 +118,7 @@
 
ggit_tag_get_target ()

 
GgitObject *
 ggit_tag_get_target (GgitTag *tag,
-                     GError **error);

+                     GError **error);

 
Gets the target GgitObject of tag
 .

 
This method performs a repository lookup for the
@@ -139,7 +139,7 @@
 

 

 
error
a GError for error reporting, or NULL.
a GError for error reporting, or NULL.

  
 

 
 

@@ -238,7 +238,7 @@
 

 
ggit_tag_get_message ()

-
const gchar *
+
const gchar *
 ggit_tag_get_message (GgitTag *tag);

 
Gets the message of tag
 .

diff -Nru libgit2-glib-0.23.10/docs/reference/html/GgitTransferProgress.html libgit2-glib-0.24.0/docs/reference/html/GgitTransferProgress.html
--- libgit2-glib-0.23.10/docs/reference/html/GgitTransferProgress.html	2016-02-05 16:21:09.000000000 +0000
+++ libgit2-glib-0.24.0/docs/reference/html/GgitTransferProgress.html	2016-03-14 23:14:08.000000000 +0000
@@ -42,7 +42,7 @@
 

-
+
@@ -177,10 +177,10 @@
 
ggit_tree_builder_insert ()
GgitTreeEntry *
 ggit_tree_builder_insert (GgitTreeBuilder *builder,
-                          const gchar *filename,
+                          const gchar *filename,
                           GgitOId *oid,
                           GgitFileMode file_mode,
-                          GError **error);

+                          GError **error);
Insert a file with a given blob in the tree builder. If the tree builder
 already contains an entry for the given file, then this entry will be
 overwritten.

@@ -217,7 +217,7 @@
 
-
+
@@ -234,7 +234,7 @@
 
ggit_tree_builder_write ()
GgitOId *
 ggit_tree_builder_write (GgitTreeBuilder *builder,
-                         GError **error);

+                         GError **error);
Write the contents of the tree builder as a tree object.

 
Parameters

@@ -252,7 +252,7 @@
 
 

-
+
@@ -268,7 +268,7 @@
 
ggit_tree_builder_get_entry ()
GgitTreeEntry *
 ggit_tree_builder_get_entry (GgitTreeBuilder *builder,
-                             const gchar *path);

+                             const gchar *path);
Get an entry by path.

 
Parameters

@@ -294,7 +294,7 @@
 

 
Returns

-
 the GGitTreeEntry or NULL if no such entry exists.

+
 the GGitTreeEntry or NULL if no such entry exists.

 

diff -Nru libgit2-glib-0.23.10/docs/reference/html/GgitTreeEntry.html libgit2-glib-0.24.0/docs/reference/html/GgitTreeEntry.html
--- libgit2-glib-0.23.10/docs/reference/html/GgitTreeEntry.html	2016-02-05 16:21:09.000000000 +0000
+++ libgit2-glib-0.24.0/docs/reference/html/GgitTreeEntry.html	2016-03-14 23:14:08.000000000 +0000
@@ -73,7 +73,7 @@
 
-
-
+
@@ -350,8 +350,8 @@
 ggit_tree_walk (GgitTree *tree,
                 GgitTreeWalkMode mode,
                 GgitTreeWalkCallback callback,
-                gpointer user_data,
-                GError **error);
+                gpointer user_data,
+                GError **error);
Walk all the entries of a tree object recursively (resolving and walking
 subtrees of the tree as needed). The error
  will be set to the error returned
@@ -388,7 +388,7 @@
 
 

-
+
diff -Nru libgit2-glib-0.23.10/docs/reference/html/index.html libgit2-glib-0.24.0/docs/reference/html/index.html
--- libgit2-glib-0.23.10/docs/reference/html/index.html	2016-02-05 16:21:09.000000000 +0000
+++ libgit2-glib-0.24.0/docs/reference/html/index.html	2016-03-14 23:14:08.000000000 +0000
@@ -14,7 +14,7 @@
 

 

 

 
 

 
-gint
+gint
 
 
 (*GgitTransferProgressCallback) ()
@@ -66,7 +66,7 @@
 

 

 
-guint
+guint
 
 
 ggit_transfer_progress_get_total_objects ()
@@ -74,7 +74,7 @@
 

 

 
-guint
+guint
 
 
 ggit_transfer_progress_get_indexed_objects ()
@@ -82,7 +82,7 @@
 

 

 
-guint
+guint
 
 
 ggit_transfer_progress_get_received_objects ()
@@ -90,7 +90,7 @@
 

 

 
-gsize
+gsize
 
 
 ggit_transfer_progress_get_received_bytes ()
@@ -114,7 +114,7 @@
 
 

 
Object Hierarchy

-
    GBoxed
+
    GBoxed
     ╰── GgitTransferProgress
 

 

@@ -125,9 +125,9 @@
 
Functions

 

 
GgitTransferProgressCallback ()

-
gint
+
gint
 (*GgitTransferProgressCallback) (GgitTransferProgress *stats,
-                                 gpointer user_data);

+                                 gpointer user_data);

 
Progress callbacks during indexing.

 

 
Parameters

@@ -210,7 +210,7 @@
 

 

 
ggit_transfer_progress_get_total_objects ()

-
guint
+
guint
 ggit_transfer_progress_get_total_objects
                                (GgitTransferProgress *progress);

 
Gets the total objects of the transfer.

@@ -237,7 +237,7 @@
 

 

 
ggit_transfer_progress_get_indexed_objects ()

-
guint
+
guint
 ggit_transfer_progress_get_indexed_objects
                                (GgitTransferProgress *progress);

 
Gets the indexed objects of the transfer.

@@ -264,7 +264,7 @@
 

 

 
ggit_transfer_progress_get_received_objects ()

-
guint
+
guint
 ggit_transfer_progress_get_received_objects
                                (GgitTransferProgress *progress);

 
Gets the received objects of the transfer.

@@ -291,7 +291,7 @@
 

 

 
ggit_transfer_progress_get_received_bytes ()

-
gsize
+
gsize
 ggit_transfer_progress_get_received_bytes
                                (GgitTransferProgress *progress);

 
Gets the received bytes of the transfer.

diff -Nru libgit2-glib-0.23.10/docs/reference/html/GgitTreeBuilder.html libgit2-glib-0.24.0/docs/reference/html/GgitTreeBuilder.html
--- libgit2-glib-0.23.10/docs/reference/html/GgitTreeBuilder.html	2016-02-05 16:21:09.000000000 +0000
+++ libgit2-glib-0.24.0/docs/reference/html/GgitTreeBuilder.html	2016-03-14 23:14:08.000000000 +0000
@@ -104,7 +104,7 @@
 

 

 
Object Hierarchy

-
    GObject
+
    GObject
     ╰── GgitObjectFactoryBase
         ╰── GgitNative
             ╰── GgitTreeBuilder
@@ -119,8 +119,8 @@
 
ggit_tree_builder_remove ()

 
void
 ggit_tree_builder_remove (GgitTreeBuilder *builder,
-                          const gchar *path,
-                          GError **error);

+                          const gchar *path,
+                          GError **error);

 
Remove an entry from the builder by path.

 

 
Parameters

@@ -143,7 +143,7 @@
 

 

 
error
a GError for error reporting, or NULL.
a GError for error reporting, or NULL.

  
 

 
 
 
 

 
error
a GError for error reporting, or NULL.
a GError for error reporting, or NULL.

  
 

 
 
 
 

 
error
a GError for error reporting, or NULL.
a GError for error reporting, or NULL.

  
 

 
 
 
 
 
 
 
 
 
const gchar *
+const gchar *
 
 
 ggit_tree_entry_get_name ()
@@ -81,7 +81,7 @@
 

 

 
-GType
+GType
 
 
 ggit_tree_entry_get_object_type ()
@@ -111,9 +111,9 @@
 
 

 
Object Hierarchy

-
    GBoxed
+
    GBoxed
     ╰── GgitTreeEntry
-    GEnum
+    GEnum
     ╰── GgitFileMode
 

 

@@ -231,7 +231,7 @@
 

 

 
ggit_tree_entry_get_name ()

-
const gchar *
+
const gchar *
 ggit_tree_entry_get_name (GgitTreeEntry *entry);

 
Get the name of the tree entry.

 

@@ -257,7 +257,7 @@
 

 

 
ggit_tree_entry_get_object_type ()

-
GType
+
GType
 ggit_tree_entry_get_object_type (GgitTreeEntry *entry);

 
Get the type of the tree entry object.

 

@@ -277,7 +277,7 @@
 

 

 
Returns

-
 a GType.

+
 a GType.

 

 

 

diff -Nru libgit2-glib-0.23.10/docs/reference/html/GgitTree.html libgit2-glib-0.24.0/docs/reference/html/GgitTree.html
--- libgit2-glib-0.23.10/docs/reference/html/GgitTree.html	2016-02-05 16:21:09.000000000 +0000
+++ libgit2-glib-0.24.0/docs/reference/html/GgitTree.html	2016-03-14 23:14:08.000000000 +0000
@@ -42,7 +42,7 @@
 

 

 
-gint
+gint
 
 
 (*GgitTreeWalkCallback) ()
@@ -66,7 +66,7 @@
 

 

 
-guint
+guint
 
 
 ggit_tree_size ()
@@ -124,9 +124,9 @@
 
 

 
Object Hierarchy

-
    GEnum
+
    GEnum
     ╰── GgitTreeWalkMode
-    GObject
+    GObject
     ╰── GgitObjectFactoryBase
         ╰── GgitNative
             ╰── GgitObject
@@ -140,10 +140,10 @@
 
Functions

 

 
GgitTreeWalkCallback ()

-
gint
-(*GgitTreeWalkCallback) (const gchar *root,
+
gint
+(*GgitTreeWalkCallback) (const gchar *root,
                          const GgitTreeEntry *entry,
-                         gpointer user_data);

+                         gpointer user_data);

 
The type of the callback functions for walking a tree.
 See ggit_tree_walk().

 

@@ -210,7 +210,7 @@
 
ggit_tree_get ()

 
GgitTreeEntry *
 ggit_tree_get (GgitTree *tree,
-               guint i);

+               guint i);

 
Get a tree entry by index.

 

 
Parameters

@@ -243,7 +243,7 @@
 

 

 
ggit_tree_size ()

-
guint
+
guint
 ggit_tree_size (GgitTree *tree);

 
Get the number of entries in the tree.

 

@@ -271,7 +271,7 @@
 
ggit_tree_get_by_name ()

 
GgitTreeEntry *
 ggit_tree_get_by_name (GgitTree *tree,
-                       const gchar *name);

+                       const gchar *name);

 
Get a tree entry by name.

 

 
Parameters

@@ -306,8 +306,8 @@
 
ggit_tree_get_by_path ()

 
GgitTreeEntry *
 ggit_tree_get_by_path (GgitTree *tree,
-                       const gchar *path,
-                       GError **error);

+                       const gchar *path,
+                       GError **error);

 
Retrieves a tree entry contained in a tree or in any of its subtrees,
 given its relative path.

 

@@ -331,7 +331,7 @@
 

 

 
error
a GError for error reporting, or NULL.
a GError for error reporting, or NULL.

  
 

 
 

 
error
a GError for error reporting, or NULL.
a GError for error reporting, or NULL.

  
 

 

-
for libgit2-glib 0.23.10
+
for libgit2-glib 0.24.0
 

 

 

@@ -23,6 +23,12 @@
 
I. API reference

 

 

+GgitAnnotatedCommit
+

+

+GgitBlameOptions
+

+

 GgitBlob
 

 

@@ -38,6 +44,9 @@
 GgitCommit
 

 

+GgitCommitParents
+

+

 GgitConfig
 

 

@@ -83,7 +92,7 @@
 Ggit Main
 

 

-GgitMergeTreeOptions
+GgitMergeOptions
 

 

 GgitMessage
@@ -107,7 +116,7 @@
 GgitPatch
 

 

-GgitPush
+GgitPushOptions
 

 

 GgitRef
diff -Nru libgit2-glib-0.23.10/docs/reference/html/libgit2-glib-1.0.devhelp2 libgit2-glib-0.24.0/docs/reference/html/libgit2-glib-1.0.devhelp2
--- libgit2-glib-0.23.10/docs/reference/html/libgit2-glib-1.0.devhelp2	2016-02-05 16:21:08.000000000 +0000
+++ libgit2-glib-0.24.0/docs/reference/html/libgit2-glib-1.0.devhelp2	2016-03-14 23:14:08.000000000 +0000
@@ -2,11 +2,14 @@
 
   
     
+      
+      
       
       
       
       
       
+      
       
       
       
@@ -22,7 +25,7 @@
       
       
       
-      
+      
       
       
       
@@ -30,7 +33,7 @@
       
       
       
-      
+      
       
       
       
@@ -52,6 +55,22 @@
     
   
   
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
     
     
     
@@ -72,6 +91,10 @@
     
     
     
+    
+    
+    
+    
     
     
     
@@ -79,8 +102,6 @@
     
     
     
-    
-    
     
     
     
@@ -89,6 +110,14 @@
     
     
     
+    
+    
+    
+    
+    
+    
+    
+    
     
     
     
@@ -168,7 +197,6 @@
     
     
     
-    
     
     
     
@@ -177,12 +205,24 @@
     
     
     
-    
     
     
     
     
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
     
+    
     
     
     
@@ -250,7 +290,19 @@
     
     
     
-    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
     
     
     
@@ -287,6 +339,13 @@
     
     
     
+    
+    
+    
+    
+    
+    
+    
     
     
     
@@ -503,10 +562,12 @@
     
     
     
+    
     
     
     
     
+    
     
     
     
@@ -568,7 +629,6 @@
     
     
     
-    
     
     
     
diff -Nru libgit2-glib-0.23.10/docs/reference/html/libgit2-glib-1.0-GgitAnnotatedCommit.html libgit2-glib-0.24.0/docs/reference/html/libgit2-glib-1.0-GgitAnnotatedCommit.html
--- libgit2-glib-0.23.10/docs/reference/html/libgit2-glib-1.0-GgitAnnotatedCommit.html	1970-01-01 00:00:00.000000000 +0000
+++ libgit2-glib-0.24.0/docs/reference/html/libgit2-glib-1.0-GgitAnnotatedCommit.html	2016-03-14 23:14:08.000000000 +0000
@@ -0,0 +1,164 @@
+
+
+
+
+GgitAnnotatedCommit: libgit2-glib Reference Manual
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+

+

+
+
+

+
GgitAnnotatedCommit

+
GgitAnnotatedCommit

+

+

+
Functions

+

++++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+





+GgitAnnotatedCommit *
+
+ggit_annotated_commit_ref ()
+

+void
+
+ggit_annotated_commit_unref ()
+

+GgitOId *
+
+ggit_annotated_commit_get_id ()
+

+

+

+
Description

+

+

+
Functions

+

+
ggit_annotated_commit_ref ()

+
GgitAnnotatedCommit *
+ggit_annotated_commit_ref (GgitAnnotatedCommit *annotated_commit);

+
Atomically increments the reference count of annotated_commit
+ by one.
+This function is MT-safe and may be called from any thread.

+

+
Parameters

+

+++++
+
+
+
+
+
+





annotated_commit
a GgitAnnotatedCommit.
 

+

+

+
Returns

+
 a newly allocated GgitAnnotatedCommit. 

+
[transfer none]

+

+

+

+

+
ggit_annotated_commit_unref ()

+
void
+ggit_annotated_commit_unref (GgitAnnotatedCommit *annotated_commit);

+
Atomically decrements the reference count of annotated_commit
+ by one.
+If the reference count drops to 0, annotated_commit
+ is freed.

+

+
Parameters

+

+++++
+
+
+
+
+
+





annotated_commit
a GgitAnnotatedCommit.
 

+

+

+

+

+
ggit_annotated_commit_get_id ()

+
GgitOId *
+ggit_annotated_commit_get_id (GgitAnnotatedCommit *annotated_commit);

+
Gets the commit ID that the given annotated_commit
+ refs to.

+

+
Parameters

+

+++++
+
+
+
+
+
+





annotated_commit
a GgitAnnotatedCommit.
 

+

+

+
Returns

+
 the commit ID that the given annotated_commit
+refs to. 

+
[transfer full]

+

+

+

+

+
Types and Values

+

+

+

+
Generated by GTK-Doc V1.24.1

+
+
\ No newline at end of file
diff -Nru libgit2-glib-0.23.10/docs/reference/html/libgit2-glib-1.0-GgitBlameOptions.html libgit2-glib-0.24.0/docs/reference/html/libgit2-glib-1.0-GgitBlameOptions.html
--- libgit2-glib-0.23.10/docs/reference/html/libgit2-glib-1.0-GgitBlameOptions.html	1970-01-01 00:00:00.000000000 +0000
+++ libgit2-glib-0.24.0/docs/reference/html/libgit2-glib-1.0-GgitBlameOptions.html	2016-03-14 23:14:08.000000000 +0000
@@ -0,0 +1,519 @@
+
+
+
+
+GgitBlameOptions: libgit2-glib Reference Manual
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+

+

+
+
+

+
GgitBlameOptions

+
GgitBlameOptions

+

+

+
Functions

+

++++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+





+GgitBlameOptions *
+
+ggit_blame_options_copy ()
+

+void
+
+ggit_blame_options_free ()
+

+GgitBlameOptions *
+
+ggit_blame_options_new ()
+

+GgitOId *
+
+ggit_blame_options_get_newest_commit ()
+

+void
+
+ggit_blame_options_set_newest_commit ()
+

+GgitOId *
+
+ggit_blame_options_get_oldest_commit ()
+

+void
+
+ggit_blame_options_set_oldest_commit ()
+

+guint32
+
+ggit_blame_options_get_minimum_line ()
+

+void
+
+ggit_blame_options_set_minimum_line ()
+

+guint32
+
+ggit_blame_options_get_maximum_line ()
+

+void
+
+ggit_blame_options_set_maximum_line ()
+

+guint16
+
+ggit_blame_options_get_minimum_match_characters ()
+

+void
+
+ggit_blame_options_set_minimum_match_characters ()
+

+

+

+
Description

+

+

+
Functions

+

+
ggit_blame_options_copy ()

+
GgitBlameOptions *
+ggit_blame_options_copy (GgitBlameOptions *blame_options);

+
Copies blame_options
+ into a newly allocated GgitBlameOptions.

+

+
Parameters

+

+++++
+
+
+
+
+
+





blame_options
a GgitBlameOptions.
 

+

+

+
Returns

+
 a newly allocated GgitBlameOptions. 

+
[transfer full]

+

+

+

+

+
ggit_blame_options_free ()

+
void
+ggit_blame_options_free (GgitBlameOptions *blame_options);

+
Frees blame_options
+.

+

+
Parameters

+

+++++
+
+
+
+
+
+





blame_options
a GgitBlameOptions.
 

+

+

+

+

+
ggit_blame_options_new ()

+
GgitBlameOptions *
+ggit_blame_options_new (void);

+
Create a new, empty GgitBlameOptions.

+

+
Returns

+
 a newly allocated GgitBlameOptions. 

+
[transfer full]

+

+

+

+

+
ggit_blame_options_get_newest_commit ()

+
GgitOId *
+ggit_blame_options_get_newest_commit (GgitBlameOptions *blame_options);

+
Get the id of the newest commit to consider in the blame. The default
+value of NULL indicates to use HEAD.

+

+
Parameters

+

+++++
+
+
+
+
+
+





blame_options
a GgitBlameOptions.
 

+

+

+
Returns

+
 a GgitOId or NULL. 

+
[transfer full]

+

+

+

+

+
ggit_blame_options_set_newest_commit ()

+
void
+ggit_blame_options_set_newest_commit (GgitBlameOptions *blame_options,
+                                      GgitOId *oid);

+
Set the id of the newest commit to consider in the blame. Specify NULL to
+set the default value which indicates to use HEAD.

+

+
Parameters

+

+++++
+
+
+
+
+
+
+
+
+
+
+
+
+





blame_options
a GgitBlameOptions.
 
oid
 a GgitOId or NULL. 
[allow-none]

+

+

+

+

+
ggit_blame_options_get_oldest_commit ()

+
GgitOId *
+ggit_blame_options_get_oldest_commit (GgitBlameOptions *blame_options);

+
Get the id of the oldest commit to consider in the blame. Teh default value
+of NULL indicates to used HEAD.

+

+
Parameters

+

+++++
+
+
+
+
+
+





blame_options
a GgitBlameOptions.
 

+

+

+
Returns

+
 a GgitOId. 

+
[transfer full]

+

+

+

+

+
ggit_blame_options_set_oldest_commit ()

+
void
+ggit_blame_options_set_oldest_commit (GgitBlameOptions *blame_options,
+                                      GgitOId *oid);

+
Set the id of the oldest commit to consider in the blame. Specify NULL to
+set the default value which indicates to consider the first commit without
+a parent.

+

+
Parameters

+

+++++
+
+
+
+
+
+
+
+
+
+
+
+
+





blame_options
a GgitBlameOptions.
 
oid
 a GgitOId. 
[allow-none]

+

+

+

+

+
ggit_blame_options_get_minimum_line ()

+
guint32
+ggit_blame_options_get_minimum_line (GgitBlameOptions *blame_options);

+
Get the first line in the file to consider. The default is 1.

+

+
Parameters

+

+++++
+
+
+
+
+
+





blame_options
a GgitBlameOptions.
 

+

+

+
Returns

+
 the first line to consider.

+

+

+

+

+
ggit_blame_options_set_minimum_line ()

+
void
+ggit_blame_options_set_minimum_line (GgitBlameOptions *blame_options,
+                                     guint32 line);

+
Set the first line in the file to consider. Lines start at 1.

+

+
Parameters

+

+++++
+
+
+
+
+
+
+
+
+
+
+
+
+





blame_options
a GgitBlameOptions.
 
line
the first line to consider.
 

+

+

+

+

+
ggit_blame_options_get_maximum_line ()

+
guint32
+ggit_blame_options_get_maximum_line (GgitBlameOptions *blame_options);

+
Get the last line in the file to consider. The default is 1.

+

+
Parameters

+

+++++
+
+
+
+
+
+





blame_options
a GgitBlameOptions.
 

+

+

+
Returns

+
 the last line to consider.

+

+

+

+

+
ggit_blame_options_set_maximum_line ()

+
void
+ggit_blame_options_set_maximum_line (GgitBlameOptions *blame_options,
+                                     guint32 line);

+
Set the last line in the file to consider. Lines start at 1.

+

+
Parameters

+

+++++
+
+
+
+
+
+
+
+
+
+
+
+
+





blame_options
a GgitBlameOptions.
 
line
the last line to consider.
 

+

+

+

+

+
ggit_blame_options_get_minimum_match_characters ()

+
guint16
+ggit_blame_options_get_minimum_match_characters
+                               (GgitBlameOptions *blame_options);

+
Get the minimum number of characters that must be detected as moving/copying
+within a file for it to associate those lines with a parent commit. This is
+only used when any of the GGIT_BLAME_TRACK_COPIES_SAME_FILE flag is
+specified. The default value is 20.

+

+
Parameters

+

+++++
+
+
+
+
+
+





blame_options
a GgitBlameOptions.
 

+

+

+
Returns

+
 the minimum number of characters.

+

+

+

+

+
ggit_blame_options_set_minimum_match_characters ()

+
void
+ggit_blame_options_set_minimum_match_characters
+                               (GgitBlameOptions *blame_options,
+                                guint16 characters);

+
Set the minimum number of characters that must be detected as moving/copying
+within a file for it to associate those lines with a parent commit. This is
+only used when any of the GGIT_BLAME_TRACK_COPIES_ flags are specified. The
+default value is 20.

+

+
Parameters

+

+++++
+
+
+
+
+
+
+
+
+
+
+
+
+





blame_options
a GgitBlameOptions.
 
characters
the minimum number of characters.
 

+

+

+

+

+
Types and Values

+

+

+

+
Generated by GTK-Doc V1.24.1

+
+
\ No newline at end of file
diff -Nru libgit2-glib-0.23.10/docs/reference/html/libgit2-glib-1.0-GgitError.html libgit2-glib-0.24.0/docs/reference/html/libgit2-glib-1.0-GgitError.html
--- libgit2-glib-0.23.10/docs/reference/html/libgit2-glib-1.0-GgitError.html	2016-02-05 16:21:09.000000000 +0000
+++ libgit2-glib-0.24.0/docs/reference/html/libgit2-glib-1.0-GgitError.html	2016-03-14 23:14:08.000000000 +0000
@@ -41,7 +41,7 @@
 
 

 
-GQuark
+GQuark
 
 
 ggit_error_quark ()
@@ -70,7 +70,7 @@
 
 

 
Object Hierarchy

-
    GEnum
+
    GEnum
     ╰── GgitError
 

 

@@ -81,11 +81,11 @@
 
Functions

 

 
ggit_error_quark ()

-
GQuark
+
GQuark
 ggit_error_quark (void);

 
Error domain for Ggit functions.
 Errors in this domain will be from the GgitError enumeration.
-See GError for information on error domains.

+See GError for information on error domains.

 

 
 

@@ -161,7 +161,7 @@
 
#define GGIT_ERROR ggit_error_quark ()
 

 
Error domain for Ggit. Errors in this domain will
-be from the GgitError enumeration. See GError for
+be from the GgitError enumeration. See GError for
 more information on error domains.

 

 
diff -Nru libgit2-glib-0.23.10/docs/reference/html/libgit2-glib-1.0-Ggit-Main.html libgit2-glib-0.24.0/docs/reference/html/libgit2-glib-1.0-Ggit-Main.html
--- libgit2-glib-0.23.10/docs/reference/html/libgit2-glib-1.0-Ggit-Main.html	2016-02-05 16:21:09.000000000 +0000
+++ libgit2-glib-0.24.0/docs/reference/html/libgit2-glib-1.0-Ggit-Main.html	2016-03-14 23:14:08.000000000 +0000
@@ -7,7 +7,7 @@
 
 
 
-
+
 
 
 
@@ -21,7 +21,7 @@
 		Home
 Up
 PrevNextNext
 

 

 

@@ -74,7 +74,7 @@
 

 

 
Object Hierarchy

-
    GFlags
+
    GFlags
     ╰── GgitFeatureFlags
 

 

diff -Nru libgit2-glib-0.23.10/docs/reference/html/libgit2-glib-1.0-GgitMergeOptions.html libgit2-glib-0.24.0/docs/reference/html/libgit2-glib-1.0-GgitMergeOptions.html
--- libgit2-glib-0.23.10/docs/reference/html/libgit2-glib-1.0-GgitMergeOptions.html	1970-01-01 00:00:00.000000000 +0000
+++ libgit2-glib-0.24.0/docs/reference/html/libgit2-glib-1.0-GgitMergeOptions.html	2016-03-14 23:14:08.000000000 +0000
@@ -0,0 +1,518 @@
+
+
+
+
+GgitMergeOptions: libgit2-glib Reference Manual
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+

+

+
+
+

+
GgitMergeOptions

+
GgitMergeOptions

+

+

+
Functions

+

++++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+





+GgitMergeOptions *
+
+ggit_merge_options_copy ()
+

+void
+
+ggit_merge_options_free ()
+

+GgitMergeOptions *
+
+ggit_merge_options_new ()
+

+void
+
+ggit_merge_options_set_rename_threshold ()
+

+guint
+
+ggit_merge_options_get_rename_threshold ()
+

+void
+
+ggit_merge_options_set_target_limit ()
+

+guint
+
+ggit_merge_options_get_target_limit ()
+

+void
+
+ggit_merge_options_set_similarity_metric ()
+

+GgitDiffSimilarityMetric *
+
+ggit_merge_options_get_similarity_metric ()
+

+void
+
+ggit_merge_options_set_file_favor ()
+

+GgitMergeFileFavor
+
+ggit_merge_options_get_file_favor ()
+

+void
+
+ggit_merge_options_set_file_flags ()
+

+GgitMergeFileFlags
+
+ggit_merge_options_get_file_flags ()
+

+

+

+
Description

+

+

+
Functions

+

+
ggit_merge_options_copy ()

+
GgitMergeOptions *
+ggit_merge_options_copy (GgitMergeOptions *merge_options);

+
Copies merge_options
+ into a newly allocated GgitMergeOptions.

+

+
Parameters

+

+++++
+
+
+
+
+
+





merge_options
a GgitMergeOptions.
 

+

+

+
Returns

+
 a newly allocated GgitMergeOptions. 

+
[transfer full]

+

+

+

+

+
ggit_merge_options_free ()

+
void
+ggit_merge_options_free (GgitMergeOptions *merge_options);

+
Frees merge_options
+.

+

+
Parameters

+

+++++
+
+
+
+
+
+





merge_options
a GgitMergeOptions.
 

+

+

+

+

+
ggit_merge_options_new ()

+
GgitMergeOptions *
+ggit_merge_options_new (void);

+
Creates a new GgitMergeOptions.

+

+
Returns

+
 a newly allocated GgitMergeOptions.

+

+

+

+

+
ggit_merge_options_set_rename_threshold ()

+
void
+ggit_merge_options_set_rename_threshold
+                               (GgitMergeOptions *merge_options,
+                                guint rename_threshold);

+
Set the rename threshold (defaults to 50). If GGIT_MERGE_TREE_FIND_RENAMES
+is enabled, added files will be compared with deleted files to
+determine their similarity. Files that are more similar than the rename
+threshold (percentage-wise) will be treated as a rename.

+

+
Parameters

+

+++++
+
+
+
+
+
+
+
+
+
+
+
+
+





merge_options
a GgitMergeOptions.
 
rename_threshold
similarity to consider a file renamed.
 

+

+

+

+

+
ggit_merge_options_get_rename_threshold ()

+
guint
+ggit_merge_options_get_rename_threshold
+                               (GgitMergeOptions *merge_options);

+
Get the rename threshold (defaults to 50). If GGIT_MERGE_TREE_FIND_RENAMES
+is enabled, added files will be compared with deleted files to
+determine their similarity. Files that are more similar than the rename
+threshold (percentage-wise) will be treated as a rename.

+

+
Parameters

+

+++++
+
+
+
+
+
+





merge_options
a GgitMergeOptions.
 

+

+

+
Returns

+
 the rename threshold.

+

+

+

+

+
ggit_merge_options_set_target_limit ()

+
void
+ggit_merge_options_set_target_limit (GgitMergeOptions *merge_options,
+                                     guint target_limit);

+
Set the maximum number of similarity sources to examine for renames (defaults to 200).
+If the number of rename candidates (add / delete pairs) is greater than
+this value, inexact rename detection is aborted.

+

+
Parameters

+

+++++
+
+
+
+
+
+
+
+
+
+
+
+
+





merge_options
a GgitMergeOptions.
 
target_limit
maximum similarity source to examine for renames.
 

+

+

+

+

+
ggit_merge_options_get_target_limit ()

+
guint
+ggit_merge_options_get_target_limit (GgitMergeOptions *merge_options);

+
Get the maximum number of similarity sources to examine for renames (defaults to 200).
+If the number of rename candidates (add / delete pairs) is greater than
+this value, inexact rename detection is aborted.

+

+
Parameters

+

+++++
+
+
+
+
+
+





merge_options
a GgitMergeOptions.
 

+

+

+
Returns

+
 the target limit.

+

+

+

+

+
ggit_merge_options_set_similarity_metric ()

+
void
+ggit_merge_options_set_similarity_metric
+                               (GgitMergeOptions *merge_options,
+                                GgitDiffSimilarityMetric *metric);

+
Set the similarity metric, or NULL for the default similarity metric.

+

+
Parameters

+

+++++
+
+
+
+
+
+
+
+
+
+
+
+
+





merge_options
a GgitMergeOptions.
 
metric
a GgitSimilarityMetric.
 

+

+

+

+

+
ggit_merge_options_get_similarity_metric ()

+
GgitDiffSimilarityMetric *
+ggit_merge_options_get_similarity_metric
+                               (GgitMergeOptions *merge_options);

+
Get the similarity metric.

+

+
Parameters

+

+++++
+
+
+
+
+
+





merge_options
a GgitMergeOptions.
 

+

+

+
Returns

+
 the similarity metric, or NULL. 

+
[transfer none]

+

+

+

+

+
ggit_merge_options_set_file_favor ()

+
void
+ggit_merge_options_set_file_favor (GgitMergeOptions *merge_options,
+                                   GgitMergeFileFavor file_favor);

+
Set flags for handling conflicting content.

+

+
Parameters

+

+++++
+
+
+
+
+
+
+
+
+
+
+
+
+





merge_options
a GgitMergeOptions.
 
file_favor
the file favor.
 

+

+

+

+

+
ggit_merge_options_get_file_favor ()

+
GgitMergeFileFavor
+ggit_merge_options_get_file_favor (GgitMergeOptions *merge_options);

+
Get flags for handling conflicting content.

+

+
Parameters

+

+++++
+
+
+
+
+
+





merge_options
a GgitMergeOptions.
 

+

+

+
Returns

+
 the file favor.

+

+

+

+

+
ggit_merge_options_set_file_flags ()

+
void
+ggit_merge_options_set_file_flags (GgitMergeOptions *merge_options,
+                                   GgitMergeFileFlags file_flags);

+
Set file merging flags.

+

+
Parameters

+

+++++
+
+
+
+
+
+
+
+
+
+
+
+
+





merge_options
a GgitMergeOptions.
 
file_flags
the file flags.
 

+

+

+

+

+
ggit_merge_options_get_file_flags ()

+
GgitMergeFileFlags
+ggit_merge_options_get_file_flags (GgitMergeOptions *merge_options);

+
Get file merging flags.

+

+
Parameters

+

+++++
+
+
+
+
+
+





merge_options
a GgitMergeOptions.
 

+

+

+
Returns

+
 the file merging flags.

+

+

+

+

+
Types and Values

+

+

+

+
Generated by GTK-Doc V1.24.1

+
+
\ No newline at end of file
diff -Nru libgit2-glib-0.23.10/docs/reference/html/libgit2-glib-1.0-GgitMergeTreeOptions.html libgit2-glib-0.24.0/docs/reference/html/libgit2-glib-1.0-GgitMergeTreeOptions.html
--- libgit2-glib-0.23.10/docs/reference/html/libgit2-glib-1.0-GgitMergeTreeOptions.html	2016-02-05 16:21:09.000000000 +0000
+++ libgit2-glib-0.24.0/docs/reference/html/libgit2-glib-1.0-GgitMergeTreeOptions.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,88 +0,0 @@
-
-
-
-
-GgitMergeTreeOptions: libgit2-glib Reference Manual
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-

-

-

-
-
-

-
GgitMergeTreeOptions

-
GgitMergeTreeOptions

-

-

-
Types and Values

-

----
-
-
-
-
-




enumGgitMergeTreeFlags

-

-

-
Object Hierarchy

-
    GFlags
-    ╰── GgitMergeTreeFlags
-

-

-

-
Description

-

-

-
Functions

-

-

-

-
Types and Values

-

-
enum GgitMergeTreeFlags

-

-
Members

-

-----
-
-
-
-
-
-





GGIT_MERGE_TREE_FIND_RENAMES

-
detect renames.

-		 

-

-

-

-

-

-
Generated by GTK-Doc V1.24.1

-
-
\ No newline at end of file
diff -Nru libgit2-glib-0.23.10/docs/reference/html/libgit2-glib-1.0-GgitMessage.html libgit2-glib-0.24.0/docs/reference/html/libgit2-glib-1.0-GgitMessage.html
--- libgit2-glib-0.23.10/docs/reference/html/libgit2-glib-1.0-GgitMessage.html	2016-02-05 16:21:09.000000000 +0000
+++ libgit2-glib-0.24.0/docs/reference/html/libgit2-glib-1.0-GgitMessage.html	2016-03-14 23:14:08.000000000 +0000
@@ -6,7 +6,7 @@
 
 
 
-
+
 
 
 
@@ -19,7 +19,7 @@
 
 Home
 Up
-Prev
+Prev
 Next
 
 

@@ -40,7 +40,7 @@
 
 
 
-gchar *
+gchar *
 
 
 ggit_message_prettify ()
@@ -55,13 +55,13 @@
 
Functions

 

 
ggit_message_prettify ()

-
gchar *
-ggit_message_prettify (const gchar *message,
-                       gboolean strip_comments,
-                       gchar comment_char);

+
gchar *
+ggit_message_prettify (const gchar *message,
+                       gboolean strip_comments,
+                       gchar comment_char);

 
Prettify a commit message by removing excess whitespace and making sure the
 last line ends with a newline. If strip_comments
- is TRUE, then lines
+ is TRUE, then lines
 starting with a comment_char
  will be removed.

 

diff -Nru libgit2-glib-0.23.10/docs/reference/html/libgit2-glib-1.0-GgitPush.html libgit2-glib-0.24.0/docs/reference/html/libgit2-glib-1.0-GgitPush.html
--- libgit2-glib-0.23.10/docs/reference/html/libgit2-glib-1.0-GgitPush.html	2016-02-05 16:21:09.000000000 +0000
+++ libgit2-glib-0.24.0/docs/reference/html/libgit2-glib-1.0-GgitPush.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,48 +0,0 @@
-
-
-
-
-GgitPush: libgit2-glib Reference Manual
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-

-

-

-
-
-

-
GgitPush

-
GgitPush

-

-

-
Description

-

-

-
Functions

-

-

-

-
Types and Values

-

-

-

-
Generated by GTK-Doc V1.24.1

-
-
\ No newline at end of file
diff -Nru libgit2-glib-0.23.10/docs/reference/html/libgit2-glib-1.0-GgitStatusOptions.html libgit2-glib-0.24.0/docs/reference/html/libgit2-glib-1.0-GgitStatusOptions.html
--- libgit2-glib-0.23.10/docs/reference/html/libgit2-glib-1.0-GgitStatusOptions.html	2016-02-05 16:21:09.000000000 +0000
+++ libgit2-glib-0.24.0/docs/reference/html/libgit2-glib-1.0-GgitStatusOptions.html	2016-03-14 23:14:08.000000000 +0000
@@ -88,9 +88,9 @@
 

 

 
Object Hierarchy

-
    GEnum
+
    GEnum
     ╰── GgitStatusShow
-    GFlags
+    GFlags
     ╰── GgitStatusOption
 

 

@@ -155,7 +155,7 @@
 
GgitStatusOptions *
 ggit_status_options_new (GgitStatusOption options,
                          GgitStatusShow show,
-                         const gchar **pathspec);

+                         const gchar **pathspec);

Creates a new GgitStatusOptions for use in ggit_repository_stash_foreach.

Parameters

diff -Nru libgit2-glib-0.23.10/docs/reference/html/rn01.html libgit2-glib-0.24.0/docs/reference/html/rn01.html --- libgit2-glib-0.23.10/docs/reference/html/rn01.html 2016-02-05 16:21:09.000000000 +0000 +++ libgit2-glib-0.24.0/docs/reference/html/rn01.html 2016-03-14 23:14:08.000000000 +0000 @@ -7,7 +7,7 @@ - + @@ -17,7 +17,7 @@ Home Prev -Next +Next
@@ -29,6 +29,12 @@

Table of Contents

+GgitAnnotatedCommit +
+
+GgitBlameOptions +
+
GgitBlob
@@ -44,6 +50,9 @@ GgitCommit
+GgitCommitParents +
+
GgitConfig
@@ -89,7 +98,7 @@ Ggit Main
-GgitMergeTreeOptions +GgitMergeOptions
GgitMessage @@ -113,7 +122,7 @@ GgitPatch
-GgitPush +GgitPushOptions
GgitRef diff -Nru libgit2-glib-0.23.10/docs/reference/libgit2-glib-1.0-docs.sgml libgit2-glib-0.24.0/docs/reference/libgit2-glib-1.0-docs.sgml --- libgit2-glib-0.23.10/docs/reference/libgit2-glib-1.0-docs.sgml 2014-02-09 20:35:38.000000000 +0000 +++ libgit2-glib-0.24.0/docs/reference/libgit2-glib-1.0-docs.sgml 2016-02-05 16:42:13.000000000 +0000 @@ -11,11 +11,14 @@ API reference + + + @@ -31,7 +34,7 @@ - + @@ -39,7 +42,7 @@ - + diff -Nru libgit2-glib-0.23.10/docs/reference/libgit2-glib-1.0-sections.txt libgit2-glib-0.24.0/docs/reference/libgit2-glib-1.0-sections.txt --- libgit2-glib-0.23.10/docs/reference/libgit2-glib-1.0-sections.txt 2016-02-05 16:21:08.000000000 +0000 +++ libgit2-glib-0.24.0/docs/reference/libgit2-glib-1.0-sections.txt 2016-03-14 23:14:08.000000000 +0000 @@ -1,8 +1,41 @@
+ggit-annotated-commit +GgitAnnotatedCommit +ggit_annotated_commit_ref +ggit_annotated_commit_unref +ggit_annotated_commit_get_id + +GGIT_ANNOTATED_COMMIT +GGIT_TYPE_ANNOTATED_COMMIT +ggit_annotated_commit_get_type +
+ +
+ggit-blame-options +GgitBlameOptions +ggit_blame_options_copy +ggit_blame_options_free +ggit_blame_options_new +ggit_blame_options_get_newest_commit +ggit_blame_options_set_newest_commit +ggit_blame_options_get_oldest_commit +ggit_blame_options_set_oldest_commit +ggit_blame_options_get_minimum_line +ggit_blame_options_set_minimum_line +ggit_blame_options_get_maximum_line +ggit_blame_options_set_maximum_line +ggit_blame_options_get_minimum_match_characters +ggit_blame_options_set_minimum_match_characters + +GGIT_BLAME_OPTIONS +GGIT_TYPE_BLAME_OPTIONS +ggit_blame_options_get_type +
+ +
ggit-blob GgitBlob GgitBlob -GgitBlobClass ggit_blob_get_raw_content ggit_blob_is_binary @@ -60,17 +93,15 @@ ggit-clone-options GgitCloneOptions GgitCloneOptions -ggit_clone_options_copy -ggit_clone_options_free ggit_clone_options_new ggit_clone_options_get_is_bare ggit_clone_options_set_is_bare -ggit_clone_options_get_remote_name -ggit_clone_options_set_remote_name ggit_clone_options_get_checkout_branch ggit_clone_options_set_checkout_branch -ggit_clone_options_get_remote_callbacks -ggit_clone_options_set_remote_callbacks +ggit_clone_options_get_local +ggit_clone_options_set_local +ggit_clone_options_get_fetch_options +ggit_clone_options_set_fetch_options GGIT_CLONE_OPTIONS GGIT_TYPE_CLONE_OPTIONS @@ -89,11 +120,6 @@ ggit_commit_get_committer ggit_commit_get_author ggit_commit_get_parents -ggit_commit_parents_ref -ggit_commit_parents_unref -ggit_commit_parents_size -ggit_commit_parents_get -ggit_commit_parents_get_id ggit_commit_get_tree ggit_commit_get_tree_id ggit_commit_get_nth_ancestor @@ -106,14 +132,23 @@ GGIT_TYPE_COMMIT GgitCommitPrivate ggit_commit_get_type -ggit_commit_parents_get_type +
+ +
+ggit-commit-parents +GgitCommitParents +GGIT_TYPE_COMMIT_PARENTS +ggit_commit_parents_new +ggit_commit_parents_get_size +ggit_commit_parents_get +ggit_commit_parents_get_id +GgitCommitParents
ggit-config GgitConfig GgitConfig -GgitConfigClass GgitConfigCallback GgitConfigLevel GgitConfigMatchCallback @@ -123,7 +158,6 @@ ggit_config_find_global ggit_config_find_system ggit_config_add_file -ggit_config_refresh ggit_config_get_int32 ggit_config_set_int32 ggit_config_get_int64 @@ -284,7 +318,6 @@ ggit_diff_hunk_get_new_start ggit_diff_hunk_get_old_lines ggit_diff_hunk_get_old_start -ggit_diff_hunk_get_type ggit_diff_hunk_ref ggit_diff_hunk_unref @@ -302,7 +335,6 @@ ggit_diff_line_get_new_lineno ggit_diff_line_get_old_lineno ggit_diff_line_get_origin -ggit_diff_line_get_type ggit_diff_line_ref ggit_diff_line_unref @@ -315,13 +347,22 @@ ggit-diff-options GgitDiffOptions GgitDiffOptions -ggit_diff_options_copy -ggit_diff_options_free +GgitDiffOptionsClass ggit_diff_options_new +ggit_diff_options_get_flags +ggit_diff_options_set_flags +ggit_diff_options_get_n_context_lines +ggit_diff_options_set_n_context_lines +ggit_diff_options_get_n_interhunk_lines +ggit_diff_options_set_n_interhunk_lines +ggit_diff_options_get_old_prefix +ggit_diff_options_set_old_prefix +ggit_diff_options_get_new_prefix +ggit_diff_options_set_new_prefix +ggit_diff_options_get_pathspec +ggit_diff_options_set_pathspec -GGIT_DIFF_OPTIONS GGIT_TYPE_DIFF_OPTIONS -ggit_diff_options_get_type
@@ -352,7 +393,6 @@ ggit-index GgitIndex GgitIndex -GgitIndexClass ggit_index_open ggit_index_read ggit_index_write @@ -453,22 +493,27 @@
-ggit-merge-tree-options -GgitMergeTreeOptions -GgitMergeAutomergeMode -GgitMergeTreeFlags -GgitMergeTreeOptions -ggit_merge_tree_options_copy -ggit_merge_tree_options_free -ggit_merge_tree_options_new - -GGIT_MERGE_TREE_OPTIONS -GGIT_TYPE_MERGE_AUTOMERGE_MODE -GGIT_TYPE_MERGE_TREE_FLAGS -GGIT_TYPE_MERGE_TREE_OPTIONS -ggit_merge_tree_options_get_type -ggit_merge_tree_flags_get_type -ggit_merge_automerge_mode_get_type +ggit-merge-options +GgitMergeOptions +ggit_merge_options_copy +ggit_merge_options_free +ggit_merge_options_new +ggit_merge_options_set_tree_flags +ggit_merge_options_get_tree_flags +ggit_merge_options_set_rename_threshold +ggit_merge_options_get_rename_threshold +ggit_merge_options_set_target_limit +ggit_merge_options_get_target_limit +ggit_merge_options_set_similarity_metric +ggit_merge_options_get_similarity_metric +ggit_merge_options_set_file_favor +ggit_merge_options_get_file_favor +ggit_merge_options_set_file_flags +ggit_merge_options_get_file_flags + +GGIT_MERGE_OPTIONS +GGIT_TYPE_MERGE_OPTIONS +ggit_merge_options_get_type
@@ -514,7 +559,6 @@ ggit-object-factory GgitObjectFactory GgitObjectFactory -GgitObjectFactoryClass ggit_object_factory_get_default ggit_object_factory_register ggit_object_factory_unregister @@ -585,24 +629,14 @@
-ggit-push -GgitPush -GgitPush -GgitPushClass -ggit_push_new -ggit_push_add_refspec -ggit_push_finish -ggit_push_is_unpack_ok - -GGIT_IS_PUSH -GGIT_IS_PUSH_CLASS -GGIT_PUSH -GGIT_PUSH_CLASS -GGIT_PUSH_GET_CLASS -GGIT_TYPE_PUSH -GGIT_PUSH_CONST -GgitPushPrivate -ggit_push_get_type +ggit-push-options +GgitPushOptions +GGIT_TYPE_PUSH_OPTIONS +GgitPushOptionsClass +ggit_push_options_new +ggit_push_options_get_parallelism +ggit_push_options_set_parallelism +GgitPushOptions
@@ -697,19 +731,12 @@ GgitRemoteDownloadTagsType GgitRemoteListCallback ggit_remote_new -ggit_remote_ref -ggit_remote_unref -ggit_remote_save ggit_remote_get_name ggit_remote_get_url ggit_remote_connect ggit_remote_get_connected ggit_remote_disconnect -ggit_remote_add_fetch_spec -ggit_remote_add_push_spec ggit_remote_list -ggit_remote_is_valid_url -ggit_remote_is_supported_url ggit_remote_head_get_local_oid ggit_remote_head_get_name ggit_remote_head_get_oid @@ -751,7 +778,6 @@ ggit_repository_create_blob_from_file ggit_repository_create_blob_from_path ggit_repository_create_commit -ggit_repository_create_commit_from_oids ggit_repository_create_tag ggit_repository_create_tag_from_buffer ggit_repository_create_tag_lightweight @@ -763,7 +789,6 @@ ggit_repository_create_branch ggit_repository_enumerate_branches ggit_repository_lookup_branch -ggit_repository_get_remote ggit_repository_create_remote ggit_repository_list_remotes ggit_repository_get_head @@ -844,7 +869,6 @@ ggit-signature GgitSignature GgitSignature -GgitSignatureClass ggit_signature_new ggit_signature_new_now ggit_signature_get_name @@ -890,25 +914,20 @@ GgitSubmoduleUpdate ggit_submodule_ref ggit_submodule_unref -ggit_submodule_save ggit_submodule_get_owner ggit_submodule_get_name ggit_submodule_get_path ggit_submodule_get_url -ggit_submodule_set_url ggit_submodule_get_index_id ggit_submodule_get_head_id ggit_submodule_get_workdir_id ggit_submodule_get_ignore -ggit_submodule_set_ignore ggit_submodule_get_update -ggit_submodule_set_update ggit_submodule_get_fetch_recurse ggit_submodule_set_fetch_recurse ggit_submodule_init ggit_submodule_sync ggit_submodule_reload -ggit_submodule_get_status GGIT_SUBMODULE GGIT_TYPE_SUBMODULE diff -Nru libgit2-glib-0.23.10/docs/reference/libgit2-glib-1.0.types libgit2-glib-0.24.0/docs/reference/libgit2-glib-1.0.types --- libgit2-glib-0.23.10/docs/reference/libgit2-glib-1.0.types 2016-02-05 16:21:08.000000000 +0000 +++ libgit2-glib-0.24.0/docs/reference/libgit2-glib-1.0.types 2016-03-14 23:14:08.000000000 +0000 @@ -58,8 +58,8 @@ ggit_index_get_type ggit_merge_file_favor_get_type ggit_merge_file_flags_get_type +ggit_merge_flags_get_type ggit_merge_options_get_type -ggit_merge_tree_flags_get_type ggit_native_get_type ggit_note_get_type ggit_object_factory_base_get_type diff -Nru libgit2-glib-0.23.10/docs/reference/version.xml libgit2-glib-0.24.0/docs/reference/version.xml --- libgit2-glib-0.23.10/docs/reference/version.xml 2016-02-05 16:20:38.000000000 +0000 +++ libgit2-glib-0.24.0/docs/reference/version.xml 2016-03-14 23:13:46.000000000 +0000 @@ -1 +1 @@ -0.23.10 +0.24.0 diff -Nru libgit2-glib-0.23.10/libgit2-glib/ggit-checkout-options.c libgit2-glib-0.24.0/libgit2-glib/ggit-checkout-options.c --- libgit2-glib-0.23.10/libgit2-glib/ggit-checkout-options.c 2015-07-14 20:32:56.000000000 +0000 +++ libgit2-glib-0.24.0/libgit2-glib/ggit-checkout-options.c 2016-02-05 16:34:42.000000000 +0000 @@ -273,7 +273,7 @@ object_class->constructed = ggit_checkout_options_constructed; /** - * GgitCheckoutOptions:strategy: (type GgitCheckoutStrategy): + * GgitCheckoutOptions::strategy: (type GgitCheckoutStrategy): * * The checkout strategy. */ diff -Nru libgit2-glib-0.23.10/libgit2-glib/ggit-commit.c libgit2-glib-0.24.0/libgit2-glib/ggit-commit.c --- libgit2-glib-0.23.10/libgit2-glib/ggit-commit.c 2015-07-14 21:06:05.000000000 +0000 +++ libgit2-glib-0.24.0/libgit2-glib/ggit-commit.c 2016-03-14 22:40:10.000000000 +0000 @@ -224,16 +224,18 @@ ggit_commit_get_committer (GgitCommit *commit) { git_commit *c; - const git_signature *signature; + const git_signature *committer; + git_signature *signature; g_return_val_if_fail (GGIT_IS_COMMIT (commit), NULL); c = _ggit_native_get (commit); - signature = git_commit_committer (c); + committer = git_commit_committer (c); + git_signature_dup (&signature, committer); - return _ggit_signature_wrap ((git_signature *)signature, + return _ggit_signature_wrap (signature, ggit_commit_get_message_encoding (commit), - FALSE); + TRUE); } /** @@ -249,16 +251,18 @@ ggit_commit_get_author (GgitCommit *commit) { git_commit *c; - const git_signature *signature; + const git_signature *author; + git_signature *signature; g_return_val_if_fail (GGIT_IS_COMMIT (commit), NULL); c = _ggit_native_get (commit); - signature = git_commit_author (c); + author = git_commit_author (c); + git_signature_dup (&signature, author); - return _ggit_signature_wrap ((git_signature *)signature, + return _ggit_signature_wrap (signature, ggit_commit_get_message_encoding (commit), - FALSE); + TRUE); } /** diff -Nru libgit2-glib-0.23.10/libgit2-glib/ggit-enum-types.c libgit2-glib-0.24.0/libgit2-glib/ggit-enum-types.c --- libgit2-glib-0.23.10/libgit2-glib/ggit-enum-types.c 2016-02-05 16:20:39.000000000 +0000 +++ libgit2-glib-0.24.0/libgit2-glib/ggit-enum-types.c 2016-03-14 23:13:46.000000000 +0000 @@ -112,6 +112,9 @@ if (the_type == 0) { static const GEnumValue values[] = { + { GGIT_CONFIG_LEVEL_PROGRAMDATA, + "GGIT_CONFIG_LEVEL_PROGRAMDATA", + "programdata" }, { GGIT_CONFIG_LEVEL_SYSTEM, "GGIT_CONFIG_LEVEL_SYSTEM", "system" }, @@ -124,6 +127,9 @@ { GGIT_CONFIG_LEVEL_LOCAL, "GGIT_CONFIG_LEVEL_LOCAL", "local" }, + { GGIT_CONFIG_LEVEL_APP, + "GGIT_CONFIG_LEVEL_APP", + "app" }, { GGIT_CONFIG_LEVEL_HIGHEST, "GGIT_CONFIG_LEVEL_HIGHEST", "highest" }, @@ -541,20 +547,29 @@ } GType -ggit_merge_tree_flags_get_type (void) +ggit_merge_flags_get_type (void) { static GType the_type = 0; if (the_type == 0) { static const GFlagsValue values[] = { - { GGIT_MERGE_TREE_FIND_RENAMES, - "GGIT_MERGE_TREE_FIND_RENAMES", - "renames" }, + { GGIT_MERGE_FIND_RENAMES, + "GGIT_MERGE_FIND_RENAMES", + "find-renames" }, + { GGIT_MERGE_FAIL_ON_CONFLICT, + "GGIT_MERGE_FAIL_ON_CONFLICT", + "fail-on-conflict" }, + { GGIT_MERGE_SKIP_REUC, + "GGIT_MERGE_SKIP_REUC", + "skip-reuc" }, + { GGIT_MERGE_NO_RECURSIVE, + "GGIT_MERGE_NO_RECURSIVE", + "no-recursive" }, { 0, NULL, NULL } }; the_type = g_flags_register_static ( - g_intern_static_string ("GgitMergeTreeFlags"), + g_intern_static_string ("GgitMergeFlags"), values); } return the_type; diff -Nru libgit2-glib-0.23.10/libgit2-glib/ggit-enum-types.h libgit2-glib-0.24.0/libgit2-glib/ggit-enum-types.h --- libgit2-glib-0.23.10/libgit2-glib/ggit-enum-types.h 2016-02-05 16:20:39.000000000 +0000 +++ libgit2-glib-0.24.0/libgit2-glib/ggit-enum-types.h 2016-03-14 23:13:46.000000000 +0000 @@ -55,8 +55,8 @@ #define GGIT_TYPE_MERGE_FILE_FLAGS (ggit_merge_file_flags_get_type()) GType ggit_merge_file_flags_get_type (void) G_GNUC_CONST; -#define GGIT_TYPE_MERGE_TREE_FLAGS (ggit_merge_tree_flags_get_type()) -GType ggit_merge_tree_flags_get_type (void) G_GNUC_CONST; +#define GGIT_TYPE_MERGE_FLAGS (ggit_merge_flags_get_type()) +GType ggit_merge_flags_get_type (void) G_GNUC_CONST; #define GGIT_TYPE_REBASE_OPERATION_TYPE (ggit_rebase_operation_type_get_type()) GType ggit_rebase_operation_type_get_type (void) G_GNUC_CONST; diff -Nru libgit2-glib-0.23.10/libgit2-glib/ggit-merge-options.c libgit2-glib-0.24.0/libgit2-glib/ggit-merge-options.c --- libgit2-glib-0.23.10/libgit2-glib/ggit-merge-options.c 2015-08-14 06:03:56.000000000 +0000 +++ libgit2-glib-0.24.0/libgit2-glib/ggit-merge-options.c 2016-03-14 22:50:14.000000000 +0000 @@ -110,33 +110,33 @@ /** * ggit_merge_options_set_tree_flags: * @merge_options: a #GgitMergeOptions. - * @tree_flags: the tree flags. + * @flags: the flags. * - * Set the tree flags to use for merging. + * Set the flags to use for merging. * **/ void -ggit_merge_options_set_tree_flags (GgitMergeOptions *merge_options, - GgitMergeTreeFlags tree_flags) +ggit_merge_options_set_flags (GgitMergeOptions *merge_options, + GgitMergeFlags flags) { g_return_if_fail (merge_options != NULL); - merge_options->merge_options.tree_flags = (git_merge_tree_flag_t)tree_flags; + merge_options->merge_options.flags = (git_merge_flag_t)flags; } /** - * ggit_merge_options_get_tree_flags: + * ggit_merge_options_get_flags: * @merge_options: a #GgitMergeOptions. * * Get the tree flags to use for merging. * - * Returns: the tree flags. + * Returns: the flags. * **/ -GgitMergeTreeFlags -ggit_merge_options_get_tree_flags (GgitMergeOptions *merge_options) +GgitMergeFlags +ggit_merge_options_get_flags (GgitMergeOptions *merge_options) { g_return_val_if_fail (merge_options != NULL, 0); - return (GgitMergeTreeFlags)merge_options->merge_options.tree_flags; + return (GgitMergeFlags)merge_options->merge_options.flags; } /** @@ -297,7 +297,7 @@ GgitMergeFileFlags file_flags) { g_return_if_fail (merge_options != NULL); - merge_options->merge_options.file_flags = (git_merge_file_flags_t)file_flags; + merge_options->merge_options.file_flags = (git_merge_file_flag_t)file_flags; } /** diff -Nru libgit2-glib-0.23.10/libgit2-glib/ggit-merge-options.h libgit2-glib-0.24.0/libgit2-glib/ggit-merge-options.h --- libgit2-glib-0.23.10/libgit2-glib/ggit-merge-options.h 2015-08-10 06:33:13.000000000 +0000 +++ libgit2-glib-0.24.0/libgit2-glib/ggit-merge-options.h 2016-03-14 22:48:25.000000000 +0000 @@ -42,10 +42,10 @@ GgitMergeOptions *ggit_merge_options_new (void); -void ggit_merge_options_set_tree_flags (GgitMergeOptions *merge_options, - GgitMergeTreeFlags tree_flags); +void ggit_merge_options_set_flags (GgitMergeOptions *merge_options, + GgitMergeFlags flags); -GgitMergeTreeFlags ggit_merge_options_get_tree_flags (GgitMergeOptions *merge_options); +GgitMergeFlags ggit_merge_options_get_flags (GgitMergeOptions *merge_options); void ggit_merge_options_set_rename_threshold (GgitMergeOptions *merge_options, guint rename_threshold); diff -Nru libgit2-glib-0.23.10/libgit2-glib/ggit-remote.c libgit2-glib-0.24.0/libgit2-glib/ggit-remote.c --- libgit2-glib-0.23.10/libgit2-glib/ggit-remote.c 2015-08-04 18:11:11.000000000 +0000 +++ libgit2-glib-0.24.0/libgit2-glib/ggit-remote.c 2016-03-14 23:04:28.000000000 +0000 @@ -294,6 +294,7 @@ * @remote: a #GgitRemote. * @direction: whether you want to receive or send data. * @callbacks: the callbacks to use for this connection. + * @custom_headers: (allow-none): extra HTTP headers to use in this connection. * @error: a #GError for error reporting, or %NULL. * * Opens a connection to a remote. @@ -305,16 +306,21 @@ ggit_remote_connect (GgitRemote *remote, GgitDirection direction, GgitRemoteCallbacks *callbacks, + const gchar * const *custom_headers, GError **error) { gint ret; + git_strarray headers; g_return_if_fail (GGIT_IS_REMOTE (remote)); g_return_if_fail (error == NULL || *error == NULL); + ggit_utils_get_git_strarray_from_str_array (custom_headers, &headers); + ret = git_remote_connect (_ggit_native_get (remote), (git_direction)direction, - _ggit_remote_callbacks_get_native (callbacks)); + _ggit_remote_callbacks_get_native (callbacks), + &headers); if (ret != GIT_OK) { diff -Nru libgit2-glib-0.23.10/libgit2-glib/ggit-remote.h libgit2-glib-0.24.0/libgit2-glib/ggit-remote.h --- libgit2-glib-0.23.10/libgit2-glib/ggit-remote.h 2015-07-22 15:57:35.000000000 +0000 +++ libgit2-glib-0.24.0/libgit2-glib/ggit-remote.h 2016-03-14 22:55:07.000000000 +0000 @@ -74,6 +74,7 @@ void ggit_remote_connect (GgitRemote *remote, GgitDirection direction, GgitRemoteCallbacks *callbacks, + const gchar * const *custom_headers, GError **error); gboolean ggit_remote_get_connected (GgitRemote *remote); diff -Nru libgit2-glib-0.23.10/libgit2-glib/ggit-signature.c libgit2-glib-0.24.0/libgit2-glib/ggit-signature.c --- libgit2-glib-0.23.10/libgit2-glib/ggit-signature.c 2015-10-14 10:00:49.000000000 +0000 +++ libgit2-glib-0.24.0/libgit2-glib/ggit-signature.c 2016-02-13 14:45:08.000000000 +0000 @@ -288,8 +288,8 @@ s = _ggit_native_get (signature); signature->name_utf8 = ensure_utf8 (signature->name_utf8, - signature->encoding, - s->name); + signature->encoding, + s->name); return signature->name_utf8; } @@ -312,8 +312,8 @@ s = _ggit_native_get (signature); signature->email_utf8 = ensure_utf8 (signature->email_utf8, - signature->encoding, - s->email); + signature->encoding, + s->email); return signature->email_utf8; } @@ -332,17 +332,22 @@ { git_signature *s; GDateTime *utc; - GTimeZone *tz; - GDateTime *ret; + GDateTime *ret = NULL; g_return_val_if_fail (GGIT_IS_SIGNATURE (signature), NULL); s = _ggit_native_get (signature); utc = g_date_time_new_from_unix_utc (s->when.time); - tz = ggit_signature_get_time_zone (signature); - ret = g_date_time_to_timezone (utc, tz); - g_date_time_unref (utc); + + if (utc != NULL) + { + GTimeZone *tz; + + tz = ggit_signature_get_time_zone (signature); + ret = g_date_time_to_timezone (utc, tz); + g_date_time_unref (utc); + } return ret; } diff -Nru libgit2-glib-0.23.10/libgit2-glib/ggit-types.c libgit2-glib-0.24.0/libgit2-glib/ggit-types.c --- libgit2-glib-0.23.10/libgit2-glib/ggit-types.c 2015-08-13 06:36:01.000000000 +0000 +++ libgit2-glib-0.24.0/libgit2-glib/ggit-types.c 2016-03-14 23:00:34.000000000 +0000 @@ -37,10 +37,12 @@ ASSERT_ENUM (GGIT_FEATURE_HTTPS, GIT_FEATURE_HTTPS); ASSERT_ENUM (GGIT_FEATURE_SSH, GIT_FEATURE_SSH); +ASSERT_ENUM (GGIT_CONFIG_LEVEL_PROGRAMDATA, GIT_CONFIG_LEVEL_PROGRAMDATA); ASSERT_ENUM (GGIT_CONFIG_LEVEL_SYSTEM, GIT_CONFIG_LEVEL_SYSTEM); ASSERT_ENUM (GGIT_CONFIG_LEVEL_XDG, GIT_CONFIG_LEVEL_XDG); ASSERT_ENUM (GGIT_CONFIG_LEVEL_GLOBAL, GIT_CONFIG_LEVEL_GLOBAL); ASSERT_ENUM (GGIT_CONFIG_LEVEL_LOCAL, GIT_CONFIG_LEVEL_LOCAL); +ASSERT_ENUM (GGIT_CONFIG_LEVEL_APP, GIT_CONFIG_LEVEL_APP); ASSERT_ENUM (GGIT_CONFIG_LEVEL_HIGHEST, GIT_CONFIG_HIGHEST_LEVEL); ASSERT_ENUM (GGIT_DELTA_UNMODIFIED, GIT_DELTA_UNMODIFIED); @@ -121,7 +123,10 @@ ASSERT_ENUM (GGIT_MERGE_FILE_FAVOR_THEIRS, GIT_MERGE_FILE_FAVOR_THEIRS); ASSERT_ENUM (GGIT_MERGE_FILE_FAVOR_UNION, GIT_MERGE_FILE_FAVOR_UNION); -ASSERT_ENUM (GGIT_MERGE_TREE_FIND_RENAMES, GIT_MERGE_TREE_FIND_RENAMES); +ASSERT_ENUM (GGIT_MERGE_FIND_RENAMES, GIT_MERGE_FIND_RENAMES); +ASSERT_ENUM (GGIT_MERGE_FAIL_ON_CONFLICT, GIT_MERGE_FAIL_ON_CONFLICT); +ASSERT_ENUM (GGIT_MERGE_SKIP_REUC, GIT_MERGE_SKIP_REUC); +ASSERT_ENUM (GGIT_MERGE_NO_RECURSIVE, GIT_MERGE_NO_RECURSIVE); ASSERT_ENUM (GGIT_REBASE_OPERATION_PICK, GIT_REBASE_OPERATION_PICK); ASSERT_ENUM (GGIT_REBASE_OPERATION_REWORD, GIT_REBASE_OPERATION_REWORD); diff -Nru libgit2-glib-0.23.10/libgit2-glib/ggit-types.h libgit2-glib-0.24.0/libgit2-glib/ggit-types.h --- libgit2-glib-0.23.10/libgit2-glib/ggit-types.h 2015-08-25 19:52:40.000000000 +0000 +++ libgit2-glib-0.24.0/libgit2-glib/ggit-types.h 2016-03-14 22:59:02.000000000 +0000 @@ -336,10 +336,12 @@ /** * GgitConfigLevel: + * @GGIT_CONFIG_LEVEL_PROGRAMDATA: System-wide on Windows, for compatibility with portable git. * @GGIT_CONFIG_LEVEL_SYSTEM: System-wide configuration file. * @GGIT_CONFIG_LEVEL_XDG: XDG compatible configuration file (.config/git/config). * @GGIT_CONFIG_LEVEL_GLOBAL: User-specific configuration file, also called Global configuration file. * @GGIT_CONFIG_LEVEL_LOCAL: Repository specific configuration file. + * @GGIT_CONFIG_LEVEL_APP: Application specific configuration file; freely defined by applications. * @GGIT_CONFIG_LEVEL_HIGHEST: Represents the highest level of a config file. * * Priority level of a config file. @@ -348,11 +350,13 @@ */ typedef enum { - GGIT_CONFIG_LEVEL_SYSTEM = 1, - GGIT_CONFIG_LEVEL_XDG = 2, - GGIT_CONFIG_LEVEL_GLOBAL = 3, - GGIT_CONFIG_LEVEL_LOCAL = 4, - GGIT_CONFIG_LEVEL_HIGHEST = -1 + GGIT_CONFIG_LEVEL_PROGRAMDATA = 1, + GGIT_CONFIG_LEVEL_SYSTEM = 2, + GGIT_CONFIG_LEVEL_XDG = 3, + GGIT_CONFIG_LEVEL_GLOBAL = 4, + GGIT_CONFIG_LEVEL_LOCAL = 5, + GGIT_CONFIG_LEVEL_APP = 6, + GGIT_CONFIG_LEVEL_HIGHEST = -1 } GgitConfigLevel; /** @@ -600,12 +604,25 @@ } GgitMergeFileFlags; /** - * GgitMergeTreeFlags: - * @GGIT_MERGE_TREE_FIND_RENAMES: detect renames. + * GgitMergeFlags: + * @GGIT_MERGE_FIND_RENAMES: detect renames that occur between the common + * ancestor and the "ours" side or the common ancestor and the "theirs" side. + * This will enable the ability to merge between a modified and renamed file. + * @GGIT_MERGE_FAIL_ON_CONFLICT: If a conflict occurs, exit immediately instead + * of attempting to continue resolving conflicts. The merge operation will + * fail with @GGIT_EMERGECONFLICT and no index will be returned. + * @GGIT_MERGE_SKIP_REUC: do not write the REUC extension on the generated index. + * @GGIT_MERGE_NO_RECURSIVE: If the commits being merged have multiple merge bases, + * do not build a recursive merge base (by merging the multiple merge bases), + * instead simply use the first base. This flag provides a similar + * merge base to `git-merge-resolve`. */ typedef enum { - GGIT_MERGE_TREE_FIND_RENAMES = (1 << 0) -} GgitMergeTreeFlags; + GGIT_MERGE_FIND_RENAMES = (1 << 0), + GGIT_MERGE_FAIL_ON_CONFLICT = (1 << 1), + GGIT_MERGE_SKIP_REUC = (1 << 2), + GGIT_MERGE_NO_RECURSIVE = (1 << 3) +} GgitMergeFlags; /** * GgitRebaseOperationType: diff -Nru libgit2-glib-0.23.10/NEWS libgit2-glib-0.24.0/NEWS --- libgit2-glib-0.23.10/NEWS 2016-02-05 16:20:06.000000000 +0000 +++ libgit2-glib-0.24.0/NEWS 2016-03-14 23:12:44.000000000 +0000 @@ -1,3 +1,8 @@ +News in 0.24.0 +-------------- +* Fix api breaks made in libgit2 +* Misc bugfixing + News in 0.23.10 -------------- * Protected against empty signature diff -Nru libgit2-glib-0.23.10/README libgit2-glib-0.24.0/README --- libgit2-glib-0.23.10/README 2016-02-05 16:19:30.000000000 +0000 +++ libgit2-glib-0.24.0/README 2016-03-14 23:13:18.000000000 +0000 @@ -15,13 +15,13 @@ Installation ============ -libgit2-glib requires libgit2-0.23.x, glib 2.44.x, gio 2.26.x and +libgit2-glib requires libgit2-0.24.x, glib 2.44.x, gio 2.26.x and gobject-introspection 0.9.x. Simple install procedure: - % tar Jxf libgit2-glib-0.23.10.tar.xz # unpack the sources - % cd libgit2-glib-0.23.10 # change to the toplevel directory + % tar Jxf libgit2-glib-0.24.0.tar.xz # unpack the sources + % cd libgit2-glib-0.24.0 # change to the toplevel directory % ./configure # run the `configure' script % make # build libgit2-glib [ Become root if necessary ]