Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 22, 2020
Merged

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

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 12 additions & 3 deletions diff_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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{})
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down