jcarr
/
git2go
1
0
Fork 0
Code Issues 52 Pull Requests 31 Packages Projects Releases Wiki Activity

Make TestApplyDiffAddFile() explicitly .Free() stuff #661

Merged
lhchavez merged 1 commits from free-stuff-in-test-apply-diff-add-file into master 2020-10-22 08:30:32 -05:00
Conversation 0 Commits 1 Files Changed 1 +12 -3
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit ddd9a7f7ac - Show all commits

15
diff_test.go
View File

@ -246,11 +246,16 @@ func TestApplyDiffAddfile(t *testing.T) {
seedTestRepo(t, repo)
addFirstFileCommit, addFileTree := addAndGetTree(t, repo, "file1", `hello`)
addFirstFileCommit, addFirstFileTree := addAndGetTree(t, repo, "file1", `hello`)
defer addFirstFileCommit.Free()
defer addFirstFileTree.Free()
addSecondFileCommit, addSecondFileTree := addAndGetTree(t, repo, "file2", `hello2`)
defer addSecondFileCommit.Free()
defer addSecondFileTree.Free()
diff, err := repo.DiffTreeToTree(addFileTree, addSecondFileTree, nil)
diff, err := repo.DiffTreeToTree(addFirstFileTree, addSecondFileTree, nil)
checkFatal(t, err)
defer diff.Free()
t.Run("check does not apply to current tree because file exists", func(t *testing.T) {
err = repo.ResetToCommit(addSecondFileCommit, ResetHard, &CheckoutOpts{})
@ -293,12 +298,15 @@ func TestApplyDiffAddfile(t *testing.T) {
commit, err := repo.LookupCommit(head.Target())
checkFatal(t, err)
defer commit.Free()
tree, err := commit.Tree()
checkFatal(t, err)
defer tree.Free()
newDiff, err := repo.DiffTreeToTree(addFileTree, tree, nil)
newDiff, err := repo.DiffTreeToTree(addFirstFileTree, tree, nil)
checkFatal(t, err)
defer newDiff.Free()
raw1b, err := diff.ToBuf(DiffFormatPatch)
checkFatal(t, err)
@ -327,6 +335,7 @@ func TestApplyDiffAddfile(t *testing.T) {
diff2, err := DiffFromBuffer(raw, repo)
checkFatal(t, err)
defer diff2.Free()
err = repo.ApplyDiff(diff2, ApplyLocationBoth, nil)
checkFatal(t, err)