diff options
| author | lhchavez <[email protected]> | 2021-09-05 13:59:36 -0700 |
|---|---|---|
| committer | GitHub <[email protected]> | 2021-09-05 13:59:36 -0700 |
| commit | dbe032c347b1a1308a4b880e7c5a06d8dfb4d507 (patch) | |
| tree | bc64fbe9c30ed7dedbff0845c3354be77de1ae30 /merge.go | |
| parent | 549706bb573653469fbcc35c839759987c318d0c (diff) | |
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.
Diffstat (limited to 'merge.go')
| -rw-r--r-- | merge.go | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -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 { |
