Merge branch 'homonym-branch-selection' into 'master'

agneum · agneum · commit a9448e7b4b9f · 2025-11-24T09:00:59.000Z
fix: sort branch list by dataStateAt

See merge request postgres-ai/database-lab!1064
diff --git a/engine/internal/provision/thinclones/zfs/branching.go b/engine/internal/provision/thinclones/zfs/branching.go
@@ -247,7 +247,7 @@ func (m *Manager) ListAllBranches(poolList []string) ([]models.BranchEntity, err
 	cmd := fmt.Sprintf(
 		// Get all ZFS snapshots (-t) with options (-o) without output headers (-H).
 		// Excluding snapshots without "dle:branch" property ("grep -v").
-		`zfs list -H -t snapshot -o %s,name %s | grep -v "^-" | cat`, branchProp, poolFilter,
+		`zfs list -H -t snapshot -S %s -o %s,name %s | grep -v "^-" | cat`, dataStateAtLabel, branchProp, poolFilter,
 	)
 
 	out, err := m.runner.Run(cmd)

Original file line number	Diff line number	Diff line change
`@@ -247,7 +247,7 @@ func (m *Manager) ListAllBranches(poolList []string) ([]models.BranchEntity, err`
`247`	`247`	`cmd := fmt.Sprintf(`
`248`	`248`	`// Get all ZFS snapshots (-t) with options (-o) without output headers (-H).`
`249`	`249`	`// Excluding snapshots without "dle:branch" property ("grep -v").`
`250`		- `zfs list -H -t snapshot -o %s,name %s \| grep -v "^-" \| cat`, branchProp, poolFilter,
	`250`	+ `zfs list -H -t snapshot -S %s -o %s,name %s \| grep -v "^-" \| cat`, dataStateAtLabel, branchProp, poolFilter,
`251`	`251`	`)`
`252`	`252`
`253`	`253`	`out, err := m.runner.Run(cmd)`