[libgit2-glib] merge-options: fix rename of member
- From: Ignacio Casal Quinteiro <icq src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libgit2-glib] merge-options: fix rename of member
- Date: Tue, 30 Jun 2015 19:18:23 +0000 (UTC)
commit 318bcfe132d5e4ed775de467d0548b3abb8ae158
Author: Ignacio Casal Quinteiro <icq gnome org>
Date: Tue Jun 30 21:06:14 2015 +0200
merge-options: fix rename of member
libgit2-glib/ggit-merge-options.c | 4 ++--
libgit2-glib/ggit-merge-options.h | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/libgit2-glib/ggit-merge-options.c b/libgit2-glib/ggit-merge-options.c
index 0c10b68..bb65ffe 100644
--- a/libgit2-glib/ggit-merge-options.c
+++ b/libgit2-glib/ggit-merge-options.c
@@ -93,7 +93,7 @@ ggit_merge_options_free (GgitMergeOptions *merge_options)
* Returns: a newly allocated #GgitMergeOptions.
*/
GgitMergeOptions *
-ggit_merge_options_new (GgitMergeTreeFlags flags,
+ggit_merge_options_new (GgitMergeTreeFlags tree_flags,
guint rename_threshold,
guint target_limit,
GgitDiffSimilarityMetric *metric,
@@ -104,7 +104,7 @@ ggit_merge_options_new (GgitMergeTreeFlags flags,
merge_options = g_slice_new (GgitMergeOptions);
- gmerge_options.flags = (git_merge_tree_flag_t)flags;
+ gmerge_options.tree_flags = (git_merge_tree_flag_t)tree_flags;
gmerge_options.rename_threshold = rename_threshold;
gmerge_options.target_limit = target_limit;
gmerge_options.metric = _ggit_diff_similarity_metric_get_similarity_metric (metric);
diff --git a/libgit2-glib/ggit-merge-options.h b/libgit2-glib/ggit-merge-options.h
index d3dce2b..a2f1416 100644
--- a/libgit2-glib/ggit-merge-options.h
+++ b/libgit2-glib/ggit-merge-options.h
@@ -40,7 +40,7 @@ const git_merge_options *
GgitMergeOptions *ggit_merge_options_copy (GgitMergeOptions *merge_options);
void ggit_merge_options_free (GgitMergeOptions *merge_options);
-GgitMergeOptions *ggit_merge_options_new (GgitMergeTreeFlags flags,
+GgitMergeOptions *ggit_merge_options_new (GgitMergeTreeFlags tree_flags,
guint
rename_threshold,
guint target_limit,
GgitDiffSimilarityMetric *metric,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]