From 37d3c2d9ad4c4e970cac02faec8ad184412c34e6 Mon Sep 17 00:00:00 2001 From: Carlos Martín Nieto Date: Fri, 5 Aug 2016 15:15:22 +0200 Subject: 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. --- git_test.go | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'git_test.go') 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) -- cgit v1.2.3