Improve check for installed git #171
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Envek
requested changes
Apr 26, 2021
cmd/root.go
Outdated
| var fs = afero.NewOsFs() | ||
| gitInitialized, _ := afero.DirExists(fs, filepath.Join(getRootPath(), ".git")) | ||
| if !gitInitialized { | ||
| log.Fatal("git is not initialized") |
There was a problem hiding this comment.
That message should be more verbose to give user a hint what to do. What git is not initialized does mean, after all?
Maybe something like that?
Suggested change
| log.Fatal("git is not initialized") | |
| log.Fatal("This command must be executed within git repository. Change working directory or initialize new repository with `git init`.") |
DmitryTsepelev
force-pushed
the
chore/better-git-check
branch
4 times, most recently
from
7c1bad7
to
503c78d
Compare
DmitryTsepelev
force-pushed
the
chore/better-git-check
branch
from
503c78d
to
7f04086
Compare
DmitryTsepelev
commented
Apr 27, 2021
| @@ -43,6 +44,21 @@ var rootCmd = &cobra.Command{ | |||
| Long: `After installation go to your project directory | |||
| and execute the following command: | |||
| lefthook install`, | |||
| PersistentPreRun: func(cmd *cobra.Command, args []string) { | |||
| if cmd.Name() == "help" || cmd.Name() == "version" { | |||
There was a problem hiding this comment.
this is a bit brittle but couldn't find a better way
DmitryTsepelev
commented
Apr 27, 2021
| @@ -115,8 +131,7 @@ func setRootPath(path string) { | |||
| // get absolute path to .git dir (project root) | |||
| cmd := exec.Command("git", "rev-parse", "--show-toplevel") | |||
|
|
|||
| outputBytes, err := cmd.CombinedOutput() | |||
| check(err) | |||
| outputBytes, _ := cmd.CombinedOutput() | |||
There was a problem hiding this comment.
we don't check the error because we either checked it in the global PersistentPreRun or don't care about git (i.e., in help or version)
|
Yeah it was a Work in progress PR, I guess it's ready now |
DmitryTsepelev
changed the title
Envek
approved these changes
Apr 27, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Closes #90, closes #114.