Use git binary or fallback to go-git #639
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
dgageot
force-pushed
the
two-git-are-better-than-one-git
branch
from
bdddeec
to
80460fa
Compare
dgageot
changed the title
dgageot
force-pushed
the
two-git-are-better-than-one-git
branch
9 times, most recently
from
60f243c
to
5052786
Compare
dlorenc
reviewed
Jun 13, 2018
pkg/skaffold/build/tag/git_commit.go
Outdated
| @@ -34,6 +41,45 @@ type GitCommit struct { | |||
|
|
|||
| // GenerateFullyQualifiedImageName tags an image with the supplied image name and the git commit. | |||
| func (c *GitCommit) GenerateFullyQualifiedImageName(workingDir string, opts *TagOptions) (string, error) { | |||
| _, err := exec.LookPath("git") | |||
pkg/skaffold/build/tag/git_commit.go
Outdated
| // The file state is dirty. To generate a unique suffix, let's hash all the modified files. | ||
| // We add a -dirty-unique-id suffix to work well with local iterations. | ||
| fqn := fmt.Sprintf("%s:%s", opts.ImageName, currentTag) | ||
| return fqn, nil |
There was a problem hiding this comment.
Why return error? It's always nil
Fixes GoogleContainerTools#323, GoogleContainerTools#563 and GoogleContainerTools#623 Signed-off-by: David Gageot <david@gageot.net>
dgageot
force-pushed
the
two-git-are-better-than-one-git
branch
from
5052786
to
bc55e50
Compare
|
@dlorenc Thanks for the review! It should be fixed now. |
dlorenc
approved these changes
Jun 14, 2018
This was referenced Jun 14, 2018
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.
The idea is to rollback to using
gitbinary by default because go-git doesn't support sa few corner cases. If git is not found it will fallback to using go-git with should be ok 99% of the timeFixes #323, #563 and #623
Signed-off-by: David Gageot david@gageot.net