Skip to content
This repository was archived by the owner on Sep 9, 2020. It is now read-only.

Fix build on master #752

Merged
merged 1 commit into from
Jun 14, 2017
Merged

Fix build on master #752

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion internal/feedback/feedback.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ func NewLockedProjectFeedback(lp gps.LockedProject, depType string) *ConstraintF
switch vt := lp.Version().(type) {
case gps.PairedVersion:
cf.LockedVersion = vt.String()
cf.Revision = vt.Underlying().String()
cf.Revision = vt.Revision().String()
case gps.UnpairedVersion: // Logically this should never occur, but handle for completeness sake
cf.LockedVersion = vt.String()
case gps.Revision:
Expand Down
4 changes: 2 additions & 2 deletions internal/feedback/feedback_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@ func TestFeedback_Constraint(t *testing.T) {
}

func TestFeedback_LockedProject(t *testing.T) {
v := gps.NewVersion("v1.1.4").Is("bc29b4f")
b := gps.NewBranch("master").Is("436f39d")
v := gps.NewVersion("v1.1.4").Pair("bc29b4f")
b := gps.NewBranch("master").Pair("436f39d")
pi := gps.ProjectIdentifier{ProjectRoot: gps.ProjectRoot("github.com/foo/bar")}

cases := []struct {
Expand Down