Add version tiebreaker to remaining sort calls

andrew · andrew · commit 056459eb1835 · 2026-03-04T16:25:55.000Z
Same issue as the diff driver: tree, licenses, and integrity commands
sorted dependencies by name only, giving nondeterministic output when
the same package appears at multiple versions.
diff --git a/cmd/integrity.go b/cmd/integrity.go
@@ -169,6 +169,9 @@ func runIntegrity(cmd *cobra.Command, args []string) error {
 		if entries[i].Name != entries[j].Name {
 			return entries[i].Name < entries[j].Name
 		}
+		if entries[i].Version != entries[j].Version {
+			return entries[i].Version < entries[j].Version
+		}
 		return entries[i].ManifestPath < entries[j].ManifestPath
 	})
 
diff --git a/cmd/licenses.go b/cmd/licenses.go
@@ -227,7 +227,10 @@ func runLicenses(cmd *cobra.Command, args []string) error {
 
 	// Sort by name
 	sort.Slice(licenseInfos, func(i, j int) bool {
-		return licenseInfos[i].Name < licenseInfos[j].Name
+		if licenseInfos[i].Name != licenseInfos[j].Name {
+			return licenseInfos[i].Name < licenseInfos[j].Name
+		}
+		return licenseInfos[i].Version < licenseInfos[j].Version
 	})
 
 	switch format {
diff --git a/cmd/tree.go b/cmd/tree.go
@@ -131,7 +131,10 @@ func buildTree(deps []database.Dependency) []*TreeNode {
 
 			// Sort dependencies
 			sort.Slice(typeDeps, func(i, j int) bool {
-				return typeDeps[i].Name < typeDeps[j].Name
+				if typeDeps[i].Name != typeDeps[j].Name {
+					return typeDeps[i].Name < typeDeps[j].Name
+				}
+				return typeDeps[i].Requirement < typeDeps[j].Requirement
 			})
 
 			for _, d := range typeDeps {

Original file line number	Diff line number	Diff line change
`@@ -169,6 +169,9 @@ func runIntegrity(cmd *cobra.Command, args []string) error {`
`169`	`169`	`if entries[i].Name != entries[j].Name {`
`170`	`170`	`return entries[i].Name < entries[j].Name`
`171`	`171`	`}`
	`172`	`+ if entries[i].Version != entries[j].Version {`
	`173`	`+ return entries[i].Version < entries[j].Version`
	`174`	`+ }`
`172`	`175`	`return entries[i].ManifestPath < entries[j].ManifestPath`
`173`	`176`	`})`
`174`	`177`