Skip to content

fix: GetGitRoot stuck #54

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

Merged
soedirgo merged 2 commits into from
Oct 18, 2021
Merged

fix: GetGitRoot stuck #54

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f528c90
fix: GetGitRoot stuck
soedirgo Oct 18, 2021
f78cf4a
chore: satisfy golangci-lint
soedirgo Oct 18, 2021
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
2 changes: 1 addition & 1 deletion internal/init/init.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ func Init() error {
}

if _, err := utils.GetGitRoot(); err != nil {
return errors.New("Error finding Git root. Are you in a Git repository?")
return err
}

if err := utils.AssertDockerIsRunning(); err != nil {
Expand Down
4 changes: 3 additions & 1 deletion internal/link/link.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -439,7 +439,9 @@ EOSQL
if err != nil {
return err
}
f.Write(diffBytes)
if _, err := f.Write(diffBytes); err != nil {
return err
}

if err := f.Close(); err != nil {
return err
Expand Down
12 changes: 12 additions & 0 deletions internal/utils/utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,6 +247,7 @@ func DockerRemoveAll() {
}); err != nil {
// TODO: Handle errors
// fmt.Fprintln(os.Stderr, err)
_ = err
}

wg.Done()
Expand All @@ -261,18 +262,29 @@ func GetGitRoot() (*string, error) {
if err != nil {
return nil, err
}

for {
_, err := os.ReadDir(".git")

if err == nil {
gitRoot, err := os.Getwd()
if err != nil {
return nil, err
}

if err := os.Chdir(origWd); err != nil {
return nil, err
}

return &gitRoot, nil
}

if cwd, err := os.Getwd(); err != nil {
return nil, err
} else if cwd == "/" {
return nil, errors.New("Cannot find Git root. Are you in a Git repository?")
}

if err := os.Chdir(".."); err != nil {
return nil, err
}
Expand Down