Skip to content

fix: resolve repo root for initialization when started from subdirectory #665

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mvanhorn wants to merge 3 commits into
base: main
Choose a base branch
from
Open

fix: resolve repo root for initialization when started from subdirectory #665

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4bae68c
fix: resolve repo root for initialization when started from subdirectory
mvanhorn Mar 9, 2026
90a8a85
fix: handle os.Getwd error in subdirectory detection
peyton-alt Mar 21, 2026
f6b964a
fix: replace os.Chdir with scoped path resolution
mvanhorn Mar 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion cmd/entire/cli/setup.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -382,11 +382,20 @@ If Entire is already configured but disabled, this re-enables it.`,
// Check if we're in a git repository first - this is a prerequisite error,
// not a usage error, so we silence Cobra's output and use SilentError
// to prevent duplicate error output in main.go
if _, err := paths.WorktreeRoot(ctx); err != nil {
repoRoot, err := paths.WorktreeRoot(ctx)
if err != nil {
fmt.Fprintln(cmd.ErrOrStderr(), "Not a git repository. Please run 'entire enable' from within a git repository.")
return NewSilentError(errors.New("not a git repository"))
}

// Notify the user when running from a subdirectory.
// All path resolution uses paths.WorktreeRoot(ctx) which returns the
// correct repo root regardless of CWD, so no directory change is needed.
cwd, err := os.Getwd() //nolint:forbidigo // Need CWD to detect subdirectory
if err == nil && cwd != repoRoot {
fmt.Fprintf(cmd.ErrOrStderr(), "Note: Running from repository root (%s)\n\n", repoRoot)
}

if err := validateSetupFlags(opts.UseLocalSettings, opts.UseProjectSettings); err != nil {
return err
}
Expand Down