Update libc/libc.go

dalehamel · fabled · dalehamel · commit 5950dcc15262 · 2025-12-05T13:52:40.000-05:00
Co-authored-by: Timo Teräs &lt;timo.teras@iki.fi&gt;
diff --git a/libc/libc.go b/libc/libc.go
@@ -34,7 +34,7 @@ func (l LibcInfo) IsEqual(other LibcInfo) bool {
 // Non-empty values from other override values in the receiver.
 func (l *LibcInfo) Merge(other LibcInfo) {
 	// If other has TSDInfo and this instance does not, take it
-	if other.TSDInfo != (TSDInfo{}) && l.TSDInfo == (TSDInfo{}) {
+	if l.TSDInfo == (TSDInfo{}) {
 		l.TSDInfo = other.TSDInfo
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ func (l LibcInfo) IsEqual(other LibcInfo) bool {`
`34`	`34`	`// Non-empty values from other override values in the receiver.`
`35`	`35`	`func (l *LibcInfo) Merge(other LibcInfo) {`
`36`	`36`	`// If other has TSDInfo and this instance does not, take it`
`37`		`- if other.TSDInfo != (TSDInfo{}) && l.TSDInfo == (TSDInfo{}) {`
	`37`	`+ if l.TSDInfo == (TSDInfo{}) {`
`38`	`38`	`l.TSDInfo = other.TSDInfo`
`39`	`39`	`}`
`40`	`40`