summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--config.go2
-rw-r--r--diff.go2
m---------vendor/libgit20
3 files changed, 3 insertions, 1 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/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
diff --git a/vendor/libgit2 b/vendor/libgit2
-Subproject c7c5f2c4ecc727ac555f51bd20353f7f3ae9c07
+Subproject f1323d9c161aeeada190fd9615a8b5a9fb8a7f3