diff now does sort first

2026-10-19 20:12:33 +02:00
parent 67ce736fd0
commit 5137646157
5 changed files with 105 additions and 3 deletions
@@ -74,6 +74,15 @@ func subtract(yaml2 yaml.MapSlice, yaml1 yaml.MapSlice) yaml.MapSlice {
 	return res
 }

+func compare(yaml1 yaml.MapSlice, yaml2 yaml.MapSlice) (yaml.MapSlice, yaml.MapSlice) {
+	((MapSlice)(yaml1)).Sort()
+	((MapSlice)(yaml2)).Sort()
+
+	diff1 := subtract(yaml2, yaml1)
+	diff2 := subtract(yaml1, yaml2)
+	return diff1, diff2
+}
+
 func diff(cmd *cobra.Command, args []string) error {
 	if len(args) != 2 {
 		return fmt.Errorf("Expected 2 files")
@@ -102,10 +111,10 @@ func diff(cmd *cobra.Command, args []string) error {
 		return fmt.Errorf("%s: %w", file2, err)
 	}

-	diff1 := subtract(yaml2, yaml1)
+	diff1, backwardDiff := compare(yaml1, yaml2)
 	diff2 := make(yaml.MapSlice, 0)
 	if SYMMETRIC_DIFF {
-		diff2 = subtract(yaml1, yaml2)
+		diff2 = backwardDiff
 	}

 	diff := diff1