Merge pull request libgit2#419 from libgit2/cmn/bump-libgit2

carlosmn · web-flow · commit 432a164805a4 · 2018-01-17T12:18:08.000Z
Cmn/bump libgit2
diff --git 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
@@ -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
@@ -1 +1 @@
-Subproject commit c7c5f2c4ecc727ac555f51bd20353f7f3ae9c07a
+Subproject commit f1323d9c161aeeada190fd9615a8b5a9fb8a7f3e

Original file line number	Diff line number	Diff line change
`@@ -437,6 +437,8 @@ const (`
`437`	`437`	`DiffShowUnmodified DiffOptionsFlag = C.GIT_DIFF_SHOW_UNMODIFIED`
`438`	`438`	`DiffPatience DiffOptionsFlag = C.GIT_DIFF_PATIENCE`
`439`	`439`	`DiffMinimal DiffOptionsFlag = C.GIT_DIFF_MINIMAL`
	`440`	`+ DiffShowBinary DiffOptionsFlag = C.GIT_DIFF_SHOW_BINARY`
	`441`	`+ DiffIndentHeuristic DiffOptionsFlag = C.GIT_DIFF_INDENT_HEURISTIC`
`440`	`442`	`)`
`441`	`443`
`442`	`444`	`type DiffNotifyCallback func(diffSoFar *Diff, deltaToAdd DiffDelta, matchedPathspec string) error`