From dbe032c347b1a1308a4b880e7c5a06d8dfb4d507 Mon Sep 17 00:00:00 2001
From: lhchavez <lhchavez@lhchavez.com>
Date: Sun, 5 Sep 2021 13:59:36 -0700
Subject: Make all non-user-creatable structures non-comparable (#802)

This change makes all non-user-creatable structures non-comparable. This
makes it easier to add changes later that don't introduce breaking
changes from the go compatibility guarantees perspective.

This, of course, implies that this change _is_ a breaking change, but since
these structures are not intended to be created by users (or de-referenced),
it should be okay.
---
 merge.go | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'merge.go')

diff --git a/merge.go b/merge.go
index dc0e7ca..a8e7d6e 100644
--- a/merge.go
+++ b/merge.go
@@ -17,6 +17,7 @@ import (
 )
 
 type AnnotatedCommit struct {
+	doNotCompare
 	ptr *C.git_annotated_commit
 	r   *Repository
 }
@@ -426,11 +427,12 @@ func (r *Repository) MergeBaseOctopus(oids []*Oid) (*Oid, error) {
 }
 
 type MergeFileResult struct {
+	doNotCompare
+	ptr           *C.git_merge_file_result
 	Automergeable bool
 	Path          string
 	Mode          uint
 	Contents      []byte
-	ptr           *C.git_merge_file_result
 }
 
 func newMergeFileResultFromC(c *C.git_merge_file_result) *MergeFileResult {
-- 
cgit v1.2.3