kbfsgit: update go-git to avoid failing on conflict files

If conflict files ended up in `objects` or `objects/pack`, go-git would still try to treat their full names as hashes, and end up trying to access a file named by the 0 hash, which would fail. Instead, just skip files like that. Issue: keybase/client#11366
keybase · Apr 16, 2018 · ae82e69 · ae82e69
1 parent 7561109
commit ae82e69
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/vendor/gopkg.in/src-d/go-git.v4/storage/filesystem/internal/dotgit/dotgit.go b/vendor/gopkg.in/src-d/go-git.v4/storage/filesystem/internal/dotgit/dotgit.go
diff --git a/vendor/vendor.json b/vendor/vendor.json
@@ -1148,11 +1148,11 @@
 			"revisionTime": "2017-12-01T00:24:35Z"
 		},
 		{
-			"checksumSHA1": "rZYExDgnlRGQip6eHLzV+ptdKFI=",
+			"checksumSHA1": "62+vHe8Tw5C0/6hrCYK55vS8C8A=",
 			"origin": "github.com/keybase/go-git/storage/filesystem/internal/dotgit",
 			"path": "gopkg.in/src-d/go-git.v4/storage/filesystem/internal/dotgit",
-			"revision": "d2b6d67be5cb04d1640faf47995ace874dc3cb05",
-			"revisionTime": "2017-12-01T00:24:35Z"
+			"revision": "58898ae21bb8fb3cdde546f12872767683a2239a",
+			"revisionTime": "2018-04-13T23:39:03Z"
 		},
 		{
 			"checksumSHA1": "4xP9AhC2OWXL3oUsZ/k6n7oMs8s=",