From ec5d2bee0ffbea5a6d952d74e37e766366b5a316 Mon Sep 17 00:00:00 2001 From: Carlos Martín Nieto Date: Wed, 17 Jan 2018 11:43:25 +0000 Subject: Bump libgit2 to f1323d9c --- config.go | 2 +- vendor/libgit2 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config.go b/config.go index c19ad32..ab9af38 100644 --- a/config.go +++ b/config.go @@ -77,7 +77,7 @@ func (c *Config) AddFile(path string, level ConfigLevel, force bool) error { runtime.LockOSThread() defer runtime.UnlockOSThread() - ret := C.git_config_add_file_ondisk(c.ptr, cpath, C.git_config_level_t(level), cbool(force)) + ret := C.git_config_add_file_ondisk(c.ptr, cpath, C.git_config_level_t(level), nil, cbool(force)) runtime.KeepAlive(c) if ret < 0 { return MakeGitError(ret) diff --git a/vendor/libgit2 b/vendor/libgit2 index c7c5f2c..f1323d9 160000 --- a/vendor/libgit2 +++ b/vendor/libgit2 @@ -1 +1 @@ -Subproject commit c7c5f2c4ecc727ac555f51bd20353f7f3ae9c07a +Subproject commit f1323d9c161aeeada190fd9615a8b5a9fb8a7f3e -- cgit v1.2.3 From a38a8e8ede58ea72e74355394950e05bb888caa2 Mon Sep 17 00:00:00 2001 From: Carlos Martín Nieto Date: Wed, 17 Jan 2018 11:47:06 +0000 Subject: diff: add two missing options --- diff.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/diff.go b/diff.go index 3cc1dc2..3088320 100644 --- a/diff.go +++ b/diff.go @@ -437,6 +437,8 @@ const ( DiffShowUnmodified DiffOptionsFlag = C.GIT_DIFF_SHOW_UNMODIFIED DiffPatience DiffOptionsFlag = C.GIT_DIFF_PATIENCE DiffMinimal DiffOptionsFlag = C.GIT_DIFF_MINIMAL + DiffShowBinary DiffOptionsFlag = C.GIT_DIFF_SHOW_BINARY + DiffIndentHeuristic DiffOptionsFlag = C.GIT_DIFF_INDENT_HEURISTIC ) type DiffNotifyCallback func(diffSoFar *Diff, deltaToAdd DiffDelta, matchedPathspec string) error -- cgit v1.2.3