mirror of
https://github.com/runkids/skillshare.git
synced 2026-11-20 12:23:22 +00:00
At the root git_root scope, `git add -A` over the config base directory records any subdirectory that has its own .git (e.g. the skills source) as an empty submodule, and can commit the machine-specific config.yaml. - Detect nested repos and warn before commit/push (CLI) or surface them on the Git Sync page with a one-click "Disable nested .git" action (UI), which renames .git to .git.disabled (reversible) and drops any stale gitlink from the index so the directory's files track as normal blobs. - Keep config.yaml out of a root-scope repo automatically: ensure it is ignored and untrack it (git rm --cached) before staging, on both the CLI and the web UI commit/push paths. - Expose nestedRepos/configTracked in GET /api/git/status and add POST /api/git/absorb-nested (validated against detected nested repos).
111 lines
2.7 KiB
Go
111 lines
2.7 KiB
Go
package main
|
|
|
|
import (
|
|
"fmt"
|
|
"os/exec"
|
|
"strings"
|
|
"time"
|
|
|
|
"skillshare/internal/config"
|
|
"skillshare/internal/oplog"
|
|
"skillshare/internal/ui"
|
|
)
|
|
|
|
// checkGitWorktree verifies source is a git worktree without requiring a remote.
|
|
func checkGitWorktree(sourcePath string, spinner *ui.Spinner) error {
|
|
cmd := exec.Command("git", "rev-parse", "--is-inside-work-tree")
|
|
cmd.Dir = sourcePath
|
|
if err := cmd.Run(); err != nil {
|
|
spinner.Fail("Source is not a git repository")
|
|
ui.Info(" Run: skillshare init")
|
|
return fmt.Errorf("not a git repository")
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func cmdCommit(args []string) error {
|
|
if wantsHelp(args) {
|
|
printCommitHelp()
|
|
return nil
|
|
}
|
|
|
|
start := time.Now()
|
|
opts := parsePushArgs(args)
|
|
|
|
cfg, err := config.Load()
|
|
if err != nil {
|
|
return fmt.Errorf("config not found: run 'skillshare init' first")
|
|
}
|
|
|
|
ui.Header("Committing local changes")
|
|
|
|
spinner := ui.StartSpinner("Checking repository...")
|
|
source, ok := resolveGitRoot(cfg, spinner)
|
|
if !ok {
|
|
return nil // Mismatch guidance already displayed
|
|
}
|
|
|
|
if err := checkGitWorktree(source, spinner); err != nil {
|
|
return nil // Error already displayed
|
|
}
|
|
|
|
if sweep := rootScopeSafetySweep(cfg, source); sweep.hasNotice() {
|
|
spinner.Stop()
|
|
sweep.printNotices(source)
|
|
spinner = ui.StartSpinner("Checking changes...")
|
|
}
|
|
|
|
changes, err := getGitChanges(source)
|
|
if err != nil {
|
|
spinner.Fail("Failed to check git status")
|
|
return err
|
|
}
|
|
if changes == "" {
|
|
spinner.Stop()
|
|
ui.Info("No changes to commit")
|
|
return nil
|
|
}
|
|
|
|
if opts.dryRun {
|
|
spinner.Stop()
|
|
ui.Warning("[dry-run] No changes will be made")
|
|
fmt.Println()
|
|
lines := strings.Split(changes, "\n")
|
|
ui.Info("Would stage %d file(s):", len(lines))
|
|
for _, line := range lines {
|
|
ui.Info(" %s", line)
|
|
}
|
|
ui.Info("Would commit with message: %s", opts.message)
|
|
return nil
|
|
}
|
|
|
|
if err := stageAndCommit(source, opts.message, spinner); err != nil {
|
|
return err
|
|
}
|
|
|
|
spinner.Stop()
|
|
ui.SuccessMsg("Commit complete (%.1fs)", time.Since(start).Seconds())
|
|
|
|
e := oplog.NewEntry("commit", "ok", time.Since(start))
|
|
e.Args = map[string]any{"message": opts.message}
|
|
oplog.WriteWithLimit(config.ConfigPath(), oplog.OpsFile, e, logMaxEntries()) //nolint:errcheck
|
|
|
|
return nil
|
|
}
|
|
|
|
func printCommitHelp() {
|
|
fmt.Println(`Usage: skillshare commit [options]
|
|
|
|
Create a local git commit for source skills without pushing.
|
|
|
|
Options:
|
|
-m, --message <msg> Commit message (default: "Update skills")
|
|
--dry-run, -n Preview changes without applying
|
|
--help, -h Show this help
|
|
|
|
Examples:
|
|
skillshare commit Commit with default message
|
|
skillshare commit -m "Update skill" Commit with custom message
|
|
skillshare commit --dry-run Preview what would happen`)
|
|
}
|