From 64e9ef88636a2a27a3bac27f47a0c125cd7117ae Mon Sep 17 00:00:00 2001 From: Aguacero Date: Thu, 29 May 2014 09:26:50 +0400 Subject: [PATCH 1/4] Fix * git2go/blob.go:63: cannot use _Ctype_size_t(len(goBuf)) (type C.size_t) as type C.ulong in function argument * git2go/merge.go:169 git_merge_analysis: now have five arguments --- blob.go | 2 +- merge.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/blob.go b/blob.go index 4277127..52c7abf 100644 --- a/blob.go +++ b/blob.go @@ -61,7 +61,7 @@ func blobChunkCb(buffer *C.char, maxLen C.size_t, payload unsafe.Pointer) int { data.Error = err return -1 } - C.memcpy(unsafe.Pointer(buffer), unsafe.Pointer(&goBuf[0]), C.size_t(len(goBuf))) + C.memcpy(unsafe.Pointer(buffer), unsafe.Pointer(&goBuf[0]), C.ulong(len(goBuf))) return len(goBuf) } diff --git a/merge.go b/merge.go index 48a28b0..c0304c3 100644 --- a/merge.go +++ b/merge.go @@ -166,7 +166,7 @@ func (r *Repository) MergeAnalysis(theirHeads []*MergeHead) (MergeAnalysis, erro } ptr := unsafe.Pointer(&gmerge_head_array[0]) var analysis C.git_merge_analysis_t - err := C.git_merge_analysis(&analysis, r.ptr, (**C.git_merge_head)(ptr), C.size_t(len(theirHeads))) + err := C.git_merge_analysis(&analysis, nil, r.ptr, (**C.git_merge_head)(ptr), C.size_t(len(theirHeads))) if err < 0 { return MergeAnalysisNone, MakeGitError(err) } From 80751baa2a6c68ae04e21490f1fcf33aa7e8375f Mon Sep 17 00:00:00 2001 From: Aguacero Date: Thu, 29 May 2014 09:35:48 +0400 Subject: [PATCH 2/4] Fix git_merge_analysis assert --- merge.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/merge.go b/merge.go index c0304c3..667b48b 100644 --- a/merge.go +++ b/merge.go @@ -166,7 +166,8 @@ func (r *Repository) MergeAnalysis(theirHeads []*MergeHead) (MergeAnalysis, erro } ptr := unsafe.Pointer(&gmerge_head_array[0]) var analysis C.git_merge_analysis_t - err := C.git_merge_analysis(&analysis, nil, r.ptr, (**C.git_merge_head)(ptr), C.size_t(len(theirHeads))) + var preference C.git_merge_preference_t = C.GIT_MERGE_PREFERENCE_NONE + err := C.git_merge_analysis(&analysis, &preference, r.ptr, (**C.git_merge_head)(ptr), C.size_t(len(theirHeads))) if err < 0 { return MergeAnalysisNone, MakeGitError(err) } From 431380f8c5466de33e05ff53717877273ee9f588 Mon Sep 17 00:00:00 2001 From: Aguacero Date: Thu, 29 May 2014 09:38:40 +0400 Subject: [PATCH 3/4] To Initialize `preference` makes no sense --- merge.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/merge.go b/merge.go index 667b48b..52d2e0c 100644 --- a/merge.go +++ b/merge.go @@ -166,7 +166,7 @@ func (r *Repository) MergeAnalysis(theirHeads []*MergeHead) (MergeAnalysis, erro } ptr := unsafe.Pointer(&gmerge_head_array[0]) var analysis C.git_merge_analysis_t - var preference C.git_merge_preference_t = C.GIT_MERGE_PREFERENCE_NONE + var preference C.git_merge_preference_t err := C.git_merge_analysis(&analysis, &preference, r.ptr, (**C.git_merge_head)(ptr), C.size_t(len(theirHeads))) if err < 0 { return MergeAnalysisNone, MakeGitError(err) From 32953ed42a453e4908f12ef2a3c16becaf4826fb Mon Sep 17 00:00:00 2001 From: Aguacero Date: Thu, 29 May 2014 10:01:35 +0400 Subject: [PATCH 4/4] Update .travis.yml --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 2a03529..10da39d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,6 +3,7 @@ language: go go: - 1.0 - 1.1 + - 1.2 - tip install: