Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions frontend/dockerfile/dfgitutil/git_ref.go
Original file line number Diff line number Diff line change
Expand Up @@ -176,8 +176,5 @@ func (gf *GitRef) loadQuery(query url.Values) error {
}
gf.Ref = branch
}
if gf.Checksum != "" && gf.Ref == "" {
gf.Ref = gf.Checksum
}
return nil
}
15 changes: 15 additions & 0 deletions frontend/dockerfile/dockerfile_addgit_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -472,11 +472,26 @@ COPY foo out
url: serverURL + "/.git?commit=" + commitHashV2,
expectOut: "v0.0.2\n",
},
{
name: "v2 by commit (wrong short)",
url: serverURL + "/.git?commit=" + commitHashV2[:8],
expectErr: "expected checksum to match",
},
{
name: "v2 by commit (short)",
url: serverURL + "/.git?commit=" + commitHashLatest[:8],
expectOut: "latest\n",
},
{
name: "v2 ref by commit",
url: serverURL + "/.git?ref=" + commitHashV2,
expectOut: "v0.0.2\n",
},
{
name: "v2 ref by commit (short)",
url: serverURL + "/.git?ref=" + commitHashV2[:8],
expectErr: "repository does not contain ref",
},
{
name: "tag with commit",
url: serverURL + "/.git?tag=v0.0.2&commit=" + commitHashV2,
Expand Down