mirror of
https://github.com/runkids/skillshare.git
synced 2026-11-19 02:17:09 +00:00
feat(cli): add resolveGitRoot scope resolver with mismatch detection
This commit is contained in:
@@ -0,0 +1,55 @@
|
||||
package main
|
||||
|
||||
import (
|
||||
"os"
|
||||
"path/filepath"
|
||||
|
||||
"skillshare/internal/config"
|
||||
"skillshare/internal/ui"
|
||||
)
|
||||
|
||||
// gitRootScopes maps each scope keyword to its resolved directory.
|
||||
func gitRootScopes(cfg *config.Config) map[string]string {
|
||||
return map[string]string{
|
||||
"root": config.BaseDir(),
|
||||
"skills": cfg.EffectiveSkillsSource(),
|
||||
"agents": cfg.EffectiveAgentsSource(),
|
||||
"extras": cfg.EffectiveExtrasSource(),
|
||||
}
|
||||
}
|
||||
|
||||
// hasGitDir reports whether dir contains a .git entry directly (not via a parent).
|
||||
func hasGitDir(dir string) bool {
|
||||
_, err := os.Stat(filepath.Join(dir, ".git"))
|
||||
return err == nil
|
||||
}
|
||||
|
||||
// resolveGitRoot returns the directory commit/push/pull should operate on.
|
||||
//
|
||||
// Option (a) mismatch handling: if the configured scope has no repo directly at
|
||||
// its directory but another scope's directory does, the user changed git_root
|
||||
// without relocating the repo. We print guidance and return ok=false so the
|
||||
// caller aborts. When no stray repo is found we return the resolved directory and
|
||||
// let the caller's existing repo check emit the standard "not a git repository"
|
||||
// guidance (this also preserves the legacy case of a skills source nested inside
|
||||
// an unrelated parent git repo).
|
||||
func resolveGitRoot(cfg *config.Config, spinner *ui.Spinner) (string, bool) {
|
||||
root := cfg.EffectiveGitRoot()
|
||||
if hasGitDir(root) {
|
||||
return root, true
|
||||
}
|
||||
for scope, dir := range gitRootScopes(cfg) {
|
||||
if dir == root {
|
||||
continue
|
||||
}
|
||||
if hasGitDir(dir) {
|
||||
spinner.Fail("Git root mismatch")
|
||||
ui.Info(" git_root operates on: %s", root)
|
||||
ui.Info(" but the git repo lives at: %s (%s)", dir, scope)
|
||||
ui.Info(" Re-run 'skillshare init' to set up git at the configured root,")
|
||||
ui.Info(" or edit git_root in %s to match.", config.ConfigPath())
|
||||
return "", false
|
||||
}
|
||||
}
|
||||
return root, true
|
||||
}
|
||||
Reference in New Issue
Block a user