diff options
| author | Carlos Martín Nieto <[email protected]> | 2019-01-04 13:18:54 +0000 |
|---|---|---|
| committer | Carlos Martín Nieto <[email protected]> | 2019-01-04 13:18:54 +0000 |
| commit | f969cc900dde4ba92c814823bc004bd1870079a9 (patch) | |
| tree | c308b299622f5b711eb73c5f539aa1afa0d93226 /index_test.go | |
| parent | bcf325244c4bfba5a722d1c9269836a3e83ecc73 (diff) | |
Bump vendored libgit2 to fba70a9d5f
This includes updating the `Index.WriteTreeTo` test as it was abusing an
oversight of the object creation safety checks and creating a tree referencing
a non-existent blob. Instead we update it to the primary purpose of this method
which is to write into a repository from an unattached index.
Diffstat (limited to 'index_test.go')
| -rw-r--r-- | index_test.go | 26 |
1 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" { |