diff options
| author | Carlos Martín Nieto <[email protected]> | 2016-08-05 15:15:22 +0200 |
|---|---|---|
| committer | Carlos Martín Nieto <[email protected]> | 2016-08-05 15:15:22 +0200 |
| commit | 37d3c2d9ad4c4e970cac02faec8ad184412c34e6 (patch) | |
| tree | 1097516a6f1e67b0eecefd90614735324baaaae8 /git_test.go | |
| parent | 3ed398a78eca05fa226d1d2cdfba22b507324dc2 (diff) | |
Update libgit2 to 73dab769
This version reloads the index on checkout, which showed we were not
persisting the updated index to disk and thus would have conflicts on
checkout.
Diffstat (limited to 'git_test.go')
| -rw-r--r-- | git_test.go | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/git_test.go b/git_test.go index 58caf71..6a58844 100644 --- a/git_test.go +++ b/git_test.go @@ -58,6 +58,8 @@ func seedTestRepo(t *testing.T, repo *Repository) (*Oid, *Oid) { checkFatal(t, err) err = idx.AddByPath("README") checkFatal(t, err) + err = idx.Write() + checkFatal(t, err) treeId, err := idx.WriteTree() checkFatal(t, err) @@ -91,6 +93,8 @@ func updateReadme(t *testing.T, repo *Repository, content string) (*Oid, *Oid) { checkFatal(t, err) err = idx.AddByPath("README") checkFatal(t, err) + err = idx.Write() + checkFatal(t, err) treeId, err := idx.WriteTree() checkFatal(t, err) |