summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarlos Martín Nieto <[email protected]>2019-01-04 13:35:12 +0000
committerGitHub <[email protected]>2019-01-04 13:35:12 +0000
commitb06a2a69003a60c244c6c3bc0da5e1fa393402cf (patch)
treec308b299622f5b711eb73c5f539aa1afa0d93226
parentbcf325244c4bfba5a722d1c9269836a3e83ecc73 (diff)
parentf969cc900dde4ba92c814823bc004bd1870079a9 (diff)
Merge pull request #471 from libgit2/cmn/bump-libgit2
Bump vendored libgit2 to fba70a9d5f
-rw-r--r--index_test.go26
m---------vendor/libgit20
2 files changed, 21 insertions, 5 deletions
diff --git a/index_test.go b/index_test.go
index f47dace..43644fa 100644
--- a/index_test.go
+++ b/index_test.go
@@ -3,6 +3,7 @@ package git
import (
"io/ioutil"
"os"
+ "path"
"runtime"
"testing"
)
@@ -59,14 +60,29 @@ func TestIndexWriteTreeTo(t *testing.T) {
repo := createTestRepo(t)
defer cleanupTestRepo(t, repo)
- repo2 := createTestRepo(t)
- defer cleanupTestRepo(t, repo2)
+ idx, err := NewIndex()
+ checkFatal(t, err)
- idx, err := repo.Index()
+ odb, err := repo.Odb()
checkFatal(t, err)
- err = idx.AddByPath("README")
+
+ content, err := ioutil.ReadFile(path.Join(repo.Workdir(), "README"))
+ checkFatal(t, err)
+
+ id, err := odb.Write(content, ObjectBlob)
checkFatal(t, err)
- treeId, err := idx.WriteTreeTo(repo2)
+
+ err = idx.Add(&IndexEntry{
+ Mode: FilemodeBlob,
+ Uid: 0,
+ Gid: 0,
+ Size: uint32(len(content)),
+ Id: id,
+ Path: "README",
+ })
+ checkFatal(t, err)
+
+ treeId, err := idx.WriteTreeTo(repo)
checkFatal(t, err)
if treeId.String() != "b7119b11e8ef7a1a5a34d3ac87f5b075228ac81e" {
diff --git a/vendor/libgit2 b/vendor/libgit2
-Subproject 838a2f2918b6d9fad8768d2498575ff5d75c35f
+Subproject fba70a9d5f1fa433968a3dfd51e3153c8eebe83