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.
This commit is contained in:
parent
3ed398a78e
commit
37d3c2d9ad
|
@ -58,6 +58,8 @@ func seedTestRepo(t *testing.T, repo *Repository) (*Oid, *Oid) {
|
||||||
checkFatal(t, err)
|
checkFatal(t, err)
|
||||||
err = idx.AddByPath("README")
|
err = idx.AddByPath("README")
|
||||||
checkFatal(t, err)
|
checkFatal(t, err)
|
||||||
|
err = idx.Write()
|
||||||
|
checkFatal(t, err)
|
||||||
treeId, err := idx.WriteTree()
|
treeId, err := idx.WriteTree()
|
||||||
checkFatal(t, err)
|
checkFatal(t, err)
|
||||||
|
|
||||||
|
@ -91,6 +93,8 @@ func updateReadme(t *testing.T, repo *Repository, content string) (*Oid, *Oid) {
|
||||||
checkFatal(t, err)
|
checkFatal(t, err)
|
||||||
err = idx.AddByPath("README")
|
err = idx.AddByPath("README")
|
||||||
checkFatal(t, err)
|
checkFatal(t, err)
|
||||||
|
err = idx.Write()
|
||||||
|
checkFatal(t, err)
|
||||||
treeId, err := idx.WriteTree()
|
treeId, err := idx.WriteTree()
|
||||||
checkFatal(t, err)
|
checkFatal(t, err)
|
||||||
|
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
Subproject commit 1dc449105b329ea4f8ea9982bc2da869d231c04a
|
Subproject commit 73dab7692e780e1df96093a54854795428eb66b4
|
Loading…
Reference in New Issue