Don't abort on git.Blame errors #968
Merged
Conversation
This file contains hidden or 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
Signed-off-by: Juanjo Alvarez <juanjo@sourced.tech>
juanjux force-pushed the no-blame-abort branch from 300b76e to 817f6b1 Compare 
erizocosmico reviewed Oct 9, 2019
internal/function/blame.go Outdated
| result, err := git.Blame(g.commit, g.curFile.Name) | ||
| if err != nil { | ||
| return err | ||
| msg := fmt.Sprintf("Error in BLAME for file %s: %s", |
There was a problem hiding this comment.
of one of the parameters is in a newline, then better put each in a new line:
msg := fmt.Sprintf( "Error in BLAME for file %s: %s", g.curFile.Name, err.Error(), ) erizocosmico suggested changes Oct 9, 2019
internal/function/blame.go Outdated
| } | ||
| | ||
| bg, err := NewBlameGenerator(commit, fIter) | ||
| bg, err := NewBlameGenerator(commit, fIter, ctx) |
There was a problem hiding this comment.
Context is by convention always the first parameter if a function takes a context.
There was a problem hiding this comment.
Fixed, thanks, learnt something new.
Signed-off-by: Juanjo Alvarez <juanjo@sourced.tech>
juanjux force-pushed the no-blame-abort branch from 7f18b6b to 9ff7004 Compare erizocosmico approved these changes Oct 9, 2019
agarciamontoro approved these changes Oct 9, 2019
ajnavarro approved these changes Oct 9, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
4 participants
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.
Fixes #966
Signed-off-by: Juanjo Alvarez juanjo@sourced.tech
make upgradecommand if applicable.