Skip to content

Add --force flag in git fetch command#1416

Merged
tonistiigi merged 2 commits intomoby:masterfrom
vladaionescu:master
Mar 30, 2020
Merged

Add --force flag in git fetch command#1416
tonistiigi merged 2 commits intomoby:masterfrom
vladaionescu:master

Conversation

@vladaionescu
Copy link
Copy Markdown
Contributor

@vladaionescu vladaionescu commented Mar 28, 2020

This fixes the following situation:

  • The ref is a branch (eg master)
  • The git source was previously used in another build, with the same URL and branch, but the branch was pointing to a different hash at the time
  • The git fetch instruction throws an error, because locally the branch is tracked as a tag and tags are considered immutable. (As the git source had been previously used, the tag already exists locally.)

By using the --force flag, the git fetch forces the local tag update.

I've tested this in my own custom application. It fixes an error that looks like this:

rpc error: code = Unknown desc = failed to fetch remote git@github.com:vladaionescu/earthly.git: exit status 1

Buildkitd log:

time="2020-03-28T01:04:00Z" level=error msg="/moby.buildkit.v1.Control/Solve returned error: exit status 1\nfailed to fetch remote git@github.com:vladaionescu/earthly.git\ngithub.com/moby/buildkit/source/git.(*gitSourceHandler).Snapshot\n\t/src/source/git/gitsource.go:280\ngithub.com/moby/buildkit/solver/llbsolver/ops.(*sourceOp).Exec\n\t/src/solver/llbsolver/ops/source.go:87\ngithub.com/moby/buildkit/solver.(*sharedOp).Exec.func1\n\t/src/solver/jobs.go:688\ngithub.com/moby/buildkit/util/flightcontrol.(*call).run\n\t/src/util/flightcontrol/flightcontrol.go:121\nsync.(*Once).doSlow\n\t/usr/local/go/src/sync/once.go:66\nsync.(*Once).Do\n\t/usr/local/go/src/sync/once.go:57\nruntime.goexit\n\t/usr/local/go/src/runtime/asm_amd64.s:1357\ngithub.com/moby/buildkit/solver.(*edge).execOp\n\t/src/solver/edge.go:869\ngithub.com/moby/buildkit/solver/internal/pipe.NewWithFunction.func2\n\t/src/solver/internal/pipe/pipe.go:82\nruntime.goexit\n\t/usr/local/go/src/runtime/asm_amd64.s:1357"

@vladaionescu
Add --force flag in git fetch command
4ce2075 
Signed-off-by: Vlad A. Ionescu <vladaionescu@users.noreply.github.com>
@vladaionescu vladaionescu mentioned this pull request Mar 28, 2020
Merged
tonistiigi
tonistiigi approved these changes Mar 28, 2020
View reviewed changes
@vladaionescu
Add comment about the use of --force
cd4a80c 
Signed-off-by: Vlad A. Ionescu <vladaionescu@users.noreply.github.com>
@tonistiigi tonistiigi merged commit d13c5af into moby:master Mar 30, 2020
@tonistiigi tonistiigi mentioned this pull request Jul 25, 2020
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@tonistiigi tonistiigi tonistiigi approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@vladaionescu @tonistiigi