Skip to content

Commit dbd86bb

Browse files
committed
Make TestApplyDiffAddFile() explicitly .Free() stuff (#661)
This change adds explicit `.Free()` calls in `TestApplyDiffAddFile()`. It was discovered in #657 that some objects were not explicitly being freed, so this fixes that! (cherry picked from commit 3a4204b)
1 parent 8b6f3d8 commit dbd86bb

File tree

1 file changed

+12
-3
lines changed

1 file changed

+12
-3
lines changed

diff_test.go

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -246,11 +246,16 @@ func TestApplyDiffAddfile(t *testing.T) {
246246

247247
seedTestRepo(t, repo)
248248

249-
addFirstFileCommit, addFileTree := addAndGetTree(t, repo, "file1", `hello`)
249+
addFirstFileCommit, addFirstFileTree := addAndGetTree(t, repo, "file1", `hello`)
250+
defer addFirstFileCommit.Free()
251+
defer addFirstFileTree.Free()
250252
addSecondFileCommit, addSecondFileTree := addAndGetTree(t, repo, "file2", `hello2`)
253+
defer addSecondFileCommit.Free()
254+
defer addSecondFileTree.Free()
251255

252-
diff, err := repo.DiffTreeToTree(addFileTree, addSecondFileTree, nil)
256+
diff, err := repo.DiffTreeToTree(addFirstFileTree, addSecondFileTree, nil)
253257
checkFatal(t, err)
258+
defer diff.Free()
254259

255260
t.Run("check does not apply to current tree because file exists", func(t *testing.T) {
256261
err = repo.ResetToCommit(addSecondFileCommit, ResetHard, &CheckoutOpts{})
@@ -293,12 +298,15 @@ func TestApplyDiffAddfile(t *testing.T) {
293298

294299
commit, err := repo.LookupCommit(head.Target())
295300
checkFatal(t, err)
301+
defer commit.Free()
296302

297303
tree, err := commit.Tree()
298304
checkFatal(t, err)
305+
defer tree.Free()
299306

300-
newDiff, err := repo.DiffTreeToTree(addFileTree, tree, nil)
307+
newDiff, err := repo.DiffTreeToTree(addFirstFileTree, tree, nil)
301308
checkFatal(t, err)
309+
defer newDiff.Free()
302310

303311
raw1b, err := diff.ToBuf(DiffFormatPatch)
304312
checkFatal(t, err)
@@ -327,6 +335,7 @@ func TestApplyDiffAddfile(t *testing.T) {
327335

328336
diff2, err := DiffFromBuffer(raw, repo)
329337
checkFatal(t, err)
338+
defer diff2.Free()
330339

331340
err = repo.ApplyDiff(diff2, ApplyLocationBoth, nil)
332341
checkFatal(t, err)

0 commit comments

Comments
 (0)