fix bug and cleanup diff

Signed-off-by: Tony Worm <tony@hofstadter.io>

go.mod

@@ -2,6 +2,8 @@ module github.com/hofstadter-io/cuetils
 
 go 1.17
 
+replace cuelang.org/go => github.com/hofstadter-io/cue v0.4.0-hofpatch-1
+
 require (
 	cuelang.org/go v0.4.0
 	github.com/hofstadter-io/hof v0.5.17
@@ -62,5 +64,3 @@ require (
 	gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 // indirect
 	moul.io/http2curl v1.0.0 // indirect
 )
-
-replace cuelang.org/go => github.com/hofstadter-io/cue v0.4.0-hofpatch-1

structural/diff.go

@@ -81,6 +81,16 @@ func diffStruct(orig, next cue.Value, opts *flags.RootPflagpole) (cue.Value, boo
 		result = result.FillPath(cue.ParsePath("\"+\""), add)
 	}
 
+	// checks to see if nothing changed
+	i := 0
+	iter, _ = result.Fields()
+	for iter.Next() {
+		i++
+	}
+	if i == 0 {
+		return result, false
+	}
+
 	return result, true
 }
 
@@ -91,7 +101,7 @@ func diffList(orig, next cue.Value, opts *flags.RootPflagpole) (cue.Value, bool)
 
 	result := []cue.Value{}
 	for oi.Next() && ni.Next() {
-		v, ok := pickValue(oi.Value(), ni.Value(), opts)
+		v, ok := diffValue(oi.Value(), ni.Value(), opts)
 		if ok {
 			result = append(result, v)
 		}

structural/pick.go

@@ -122,8 +122,6 @@ func pickList(pick, from cue.Value, opts *flags.RootPflagpole) (cue.Value, bool)
 	}
 
 	return ctx.NewList(result...), true
-
-	return pick, false
 }
 
 func pickLeaf(pick, from cue.Value, opts *flags.RootPflagpole) (cue.Value, bool) {