From 30c57ff09ef08b4019701320f328b3587e326df0 Mon Sep 17 00:00:00 2001
From: lhchavez <lhchavez@lhchavez.com>
Date: Sun, 6 Jan 2019 07:34:50 -0800
Subject: Add support for Go 1.11 modules

This change adds a `go.mod` file. An empty file is sufficient since this
project has no external dependencies. For people that want to use the static
version of libgit2, this module can be vendored and the following can be added
to their `go.mod` file:

    replace github.com/libgit2/git2go => ./vendor/github.com/libgit2/git2go
---
 go.mod | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 go.mod

(limited to 'go.mod')

diff --git a/go.mod b/go.mod
new file mode 100644
index 0000000..688b8e3
--- /dev/null
+++ b/go.mod
@@ -0,0 +1 @@
+module github.com/libgit2/git2go
-- 
cgit v1.2.3


From 97e6392d3ab67bbf3e3e59b86a0bc9ebf7430e98 Mon Sep 17 00:00:00 2001
From: Carlos Martín Nieto <carlosmn@github.com>
Date: Tue, 10 Dec 2019 22:15:32 +0000
Subject: Adjust to libgit2 changes

---
 credentials.go | 1 +
 go.mod         | 2 ++
 merge.go       | 4 ++--
 odb.go         | 2 +-
 stash.go       | 2 +-
 5 files changed, 7 insertions(+), 4 deletions(-)

(limited to 'go.mod')

diff --git a/credentials.go b/credentials.go
index 4e42b6e..766619c 100644
--- a/credentials.go
+++ b/credentials.go
@@ -2,6 +2,7 @@ package git
 
 /*
 #include <git2.h>
+#include <git2/sys/cred.h>
 */
 import "C"
 import "unsafe"
diff --git a/go.mod b/go.mod
index 688b8e3..7a68658 100644
--- a/go.mod
+++ b/go.mod
@@ -1 +1,3 @@
 module github.com/libgit2/git2go
+
+go 1.13
diff --git a/merge.go b/merge.go
index bc672ce..955289a 100644
--- a/merge.go
+++ b/merge.go
@@ -132,7 +132,7 @@ func (mo *MergeOptions) toC() *C.git_merge_options {
 	}
 	return &C.git_merge_options{
 		version:          C.uint(mo.Version),
-		flags:            C.git_merge_flag_t(mo.TreeFlags),
+		flags:            C.uint32_t(mo.TreeFlags),
 		rename_threshold: C.uint(mo.RenameThreshold),
 		target_limit:     C.uint(mo.TargetLimit),
 		file_favor:       C.git_merge_file_favor_t(mo.FileFavor),
@@ -394,7 +394,7 @@ func populateCMergeFileOptions(c *C.git_merge_file_options, options MergeFileOpt
 	c.our_label = C.CString(options.OurLabel)
 	c.their_label = C.CString(options.TheirLabel)
 	c.favor = C.git_merge_file_favor_t(options.Favor)
-	c.flags = C.git_merge_file_flag_t(options.Flags)
+	c.flags = C.uint32_t(options.Flags)
 	c.marker_size = C.ushort(options.MarkerSize)
 }
 
diff --git a/odb.go b/odb.go
index fec0eb9..6489653 100644
--- a/odb.go
+++ b/odb.go
@@ -221,7 +221,7 @@ func (v *Odb) NewWriteStream(size int64, otype ObjectType) (*OdbWriteStream, err
 	runtime.LockOSThread()
 	defer runtime.UnlockOSThread()
 
-	ret := C.git_odb_open_wstream(&stream.ptr, v.ptr, C.git_off_t(size), C.git_object_t(otype))
+	ret := C.git_odb_open_wstream(&stream.ptr, v.ptr, C.git_object_size_t(size), C.git_object_t(otype))
 	runtime.KeepAlive(v)
 	if ret < 0 {
 		return nil, MakeGitError(ret)
diff --git a/stash.go b/stash.go
index 8743da8..6624bce 100644
--- a/stash.go
+++ b/stash.go
@@ -171,7 +171,7 @@ func (opts *StashApplyOptions) toC() (
 
 		optsC = &C.git_stash_apply_options{
 			version: C.GIT_STASH_APPLY_OPTIONS_VERSION,
-			flags:   C.git_stash_apply_flags(opts.Flags),
+			flags:   C.uint32_t(opts.Flags),
 		}
 		populateCheckoutOpts(&optsC.checkout_options, &opts.CheckoutOptions)
 		if opts.ProgressCallback != nil {
-- 
cgit v1.2.3