[libgit2-glib] Fix diff api break.
- From: Ignacio Casal Quinteiro <icq src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libgit2-glib] Fix diff api break.
- Date: Wed, 19 Dec 2012 12:33:17 +0000 (UTC)
commit 07f2cba7be4ba87ba73e8eaf5c04bcc2dabc8278
Author: Ignacio Casal Quinteiro <ignacio casal nice-software com>
Date: Wed Dec 19 13:33:06 2012 +0100
Fix diff api break.
libgit2-glib/ggit-diff.c | 18 +++++++++---------
libgit2-glib/ggit-diff.h | 6 +++---
2 files changed, 12 insertions(+), 12 deletions(-)
---
diff --git a/libgit2-glib/ggit-diff.c b/libgit2-glib/ggit-diff.c
index 68413b3..ca8f5b8 100644
--- a/libgit2-glib/ggit-diff.c
+++ b/libgit2-glib/ggit-diff.c
@@ -182,7 +182,7 @@ ggit_diff_new_tree_to_tree (GgitRepository *repository,
}
/**
- * ggit_diff_new_index_to_tree:
+ * ggit_diff_new_tree_to_index:
* @repository: a #GgitRepository.
* @old_tree: a #GgitTree to diff from.
* @index: (allow-none): a #GgitIndex, or %NULL.
@@ -198,7 +198,7 @@ ggit_diff_new_tree_to_tree (GgitRepository *repository,
* Returns: a newly allocated #GgitDiff if there was no error, %NULL otherwise.
*/
GgitDiff *
-ggit_diff_new_index_to_tree (GgitRepository *repository,
+ggit_diff_new_tree_to_index (GgitRepository *repository,
GgitTree *old_tree,
GgitIndex *index,
GgitDiffOptions *diff_options,
@@ -211,7 +211,7 @@ ggit_diff_new_index_to_tree (GgitRepository *repository,
g_return_val_if_fail (GGIT_IS_TREE (old_tree), NULL);
g_return_val_if_fail (error == NULL || *error == NULL, NULL);
- ret = git_diff_index_to_tree (&diff,
+ ret = git_diff_tree_to_index (&diff,
_ggit_native_get (repository),
_ggit_native_get (old_tree),
index ? _ggit_native_get (index) : NULL,
@@ -227,7 +227,7 @@ ggit_diff_new_index_to_tree (GgitRepository *repository,
}
/**
- * ggit_diff_new_workdir_to_index:
+ * ggit_diff_new_index_to_workdir:
* @repository: a #GgitRepository.
* @index: (allow-none): a #GgitIndex, or %NULL.
* @diff_options: (allow-none): a #GgitDiffOptions, or %NULL.
@@ -242,7 +242,7 @@ ggit_diff_new_index_to_tree (GgitRepository *repository,
* Returns: a newly allocated #GgitDiff if there was no error, %NULL otherwise.
*/
GgitDiff *
-ggit_diff_new_workdir_to_index (GgitRepository *repository,
+ggit_diff_new_index_to_workdir (GgitRepository *repository,
GgitIndex *index,
GgitDiffOptions *diff_options,
GError **error)
@@ -253,7 +253,7 @@ ggit_diff_new_workdir_to_index (GgitRepository *repository,
g_return_val_if_fail (GGIT_IS_REPOSITORY (repository), NULL);
g_return_val_if_fail (error == NULL || *error == NULL, NULL);
- ret = git_diff_workdir_to_index (&diff,
+ ret = git_diff_index_to_workdir (&diff,
_ggit_native_get (repository),
index ? _ggit_native_get (index) : NULL,
_ggit_diff_options_get_diff_options (diff_options));
@@ -268,7 +268,7 @@ ggit_diff_new_workdir_to_index (GgitRepository *repository,
}
/**
- * ggit_diff_new_workdir_to_tree:
+ * ggit_diff_new_tree_to_workdir:
* @repository: a #GgitRepository.
* @old_tree: a #GgitTree to diff from.
* @diff_options: (allow-none): a #GgitDiffOptions, or %NULL.
@@ -282,7 +282,7 @@ ggit_diff_new_workdir_to_index (GgitRepository *repository,
* Returns: a newly allocated #GgitDiff if there was no error, %NULL otherwise.
*/
GgitDiff *
-ggit_diff_new_workdir_to_tree (GgitRepository *repository,
+ggit_diff_new_tree_to_workdir (GgitRepository *repository,
GgitTree *old_tree,
GgitDiffOptions *diff_options,
GError **error)
@@ -294,7 +294,7 @@ ggit_diff_new_workdir_to_tree (GgitRepository *repository,
g_return_val_if_fail (GGIT_IS_TREE (old_tree), NULL);
g_return_val_if_fail (error == NULL || *error == NULL, NULL);
- ret = git_diff_workdir_to_tree (&diff,
+ ret = git_diff_tree_to_workdir (&diff,
_ggit_native_get (repository),
_ggit_native_get (old_tree),
_ggit_diff_options_get_diff_options (diff_options));
diff --git a/libgit2-glib/ggit-diff.h b/libgit2-glib/ggit-diff.h
index 4228e04..f6edd03 100644
--- a/libgit2-glib/ggit-diff.h
+++ b/libgit2-glib/ggit-diff.h
@@ -65,16 +65,16 @@ GgitDiff *ggit_diff_new_tree_to_tree (GgitRepository *repository,
GgitTree *new_tree,
GgitDiffOptions *diff_options,
GError **error);
-GgitDiff *ggit_diff_new_index_to_tree (GgitRepository *repository,
+GgitDiff *ggit_diff_new_tree_to_index (GgitRepository *repository,
GgitTree *old_tree,
GgitIndex *index,
GgitDiffOptions *diff_options,
GError **error);
-GgitDiff *ggit_diff_new_workdir_to_index (GgitRepository *repository,
+GgitDiff *ggit_diff_new_index_to_workdir (GgitRepository *repository,
GgitIndex *index,
GgitDiffOptions *diff_options,
GError **error);
-GgitDiff *ggit_diff_new_workdir_to_tree (GgitRepository *repository,
+GgitDiff *ggit_diff_new_tree_to_workdir (GgitRepository *repository,
GgitTree *old_tree,
GgitDiffOptions *diff_options,
GError **error);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]