Skip to content
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

Jump to bottom

improve error message for dirty git tree #12

Merged
merged 1 commit into from
Feb 25, 2022
Merged

improve error message for dirty git tree #12

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 10 additions & 1 deletion pkg/diff/run.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ func Run(opts Options) (*Diff, error) {
if stat, err := wt.Status(); err != nil {
return nil, fmt.Errorf("failed to get git status: %w", err)
} else if !stat.IsClean() {
return nil, fmt.Errorf("git tree is dirty")
return nil, &GitStatusError{stat, fmt.Errorf("current git tree is dirty")}
}

origRef, err := repo.Head()
Expand Down Expand Up @@ -103,6 +103,15 @@ func Run(opts Options) (*Diff, error) {
return diff, nil
}

type GitStatusError struct {
Stat git.Status
Err error
}

func (err *GitStatusError) Error() string {
return fmt.Sprintf("%v\n%v", err.Err, err.Stat)
}

func compareChangesAdditionsAndRemovals(oldPkgs, newPkgs map[string]*packages.Package) (map[string]apidiff.Report, bool) {
reports, incompatible := compareChangesAndAdditions(oldPkgs, newPkgs)

Expand Down