diff options
| -rw-r--r-- | package_git.go | 7 | ||||
| -rw-r--r-- | package_git_test.go | 3 | ||||
| -rw-r--r-- | package_test.go | 32 | ||||
| -rw-r--r-- | testdata/beku.db | 2 |
4 files changed, 25 insertions, 19 deletions
diff --git a/package_git.go b/package_git.go index ba2af99..0f41551 100644 --- a/package_git.go +++ b/package_git.go @@ -372,11 +372,16 @@ func (pkg *Package) gitUpdate(newPkg *Package) (err error) { return } - err = pkg.gitCheckoutVersion(newPkg.Version) + err = pkg.gitFetch() if err != nil { err = fmt.Errorf("gitUpdate: %s", err) return } + err = pkg.gitCheckoutVersion(newPkg.Version) + if err != nil { + err = fmt.Errorf("gitUpdate: %s", err) + } + return } diff --git a/package_git_test.go b/package_git_test.go index 991fa2c..8a67f29 100644 --- a/package_git_test.go +++ b/package_git_test.go @@ -110,9 +110,6 @@ func testGitFetch(t *testing.T) { expVersionNext: "v0.2.0", expStdout: `Fetching origin `, - expStderr: `From github.com:shuLhan/beku_test - * [new branch] master -> origin/master -`, }, { desc: "With tag #2", curVersion: "v0.2.0", diff --git a/package_test.go b/package_test.go index cdac7f4..3361294 100644 --- a/package_test.go +++ b/package_test.go @@ -573,13 +573,14 @@ func testUpdate(t *testing.T) { isTag: true, }, expPkg: &Package{ - vcs: VCSModeGit, - ImportPath: testGitRepo, - FullPath: filepath.Join(testEnv.dirSrc, testGitRepo), - RemoteName: gitDefRemoteName, - RemoteURL: "git@github.com:shuLhan/beku_test.git", - Version: "v0.1.0", - isTag: true, + vcs: VCSModeGit, + ImportPath: testGitRepo, + FullPath: filepath.Join(testEnv.dirSrc, testGitRepo), + RemoteName: gitDefRemoteName, + RemoteURL: "git@github.com:shuLhan/beku_test.git", + Version: "v0.1.0", + VersionNext: "c9f69fb", + isTag: true, }, }, { desc: "Update version back", @@ -600,13 +601,14 @@ func testUpdate(t *testing.T) { isTag: true, }, expPkg: &Package{ - vcs: VCSModeGit, - ImportPath: testGitRepo, - FullPath: filepath.Join(testEnv.dirSrc, testGitRepo), - RemoteName: gitDefRemoteName, - RemoteURL: "git@github.com:shuLhan/beku_test.git", - Version: "c9f69fb", - isTag: false, + vcs: VCSModeGit, + ImportPath: testGitRepo, + FullPath: filepath.Join(testEnv.dirSrc, testGitRepo), + RemoteName: gitDefRemoteName, + RemoteURL: "git@github.com:shuLhan/beku_test.git", + Version: "c9f69fb", + VersionNext: "c9f69fb", + isTag: false, }, }} @@ -630,7 +632,7 @@ func testUpdate(t *testing.T) { t.Log("stdout:", stdout) } - test.Assert(t, "current pkg", c.expPkg, c.curPkg, true) + test.Assert(t, "current pkg", *c.expPkg, *c.curPkg, true) } } diff --git a/testdata/beku.db b/testdata/beku.db index 2d288bf..e4fec16 100644 --- a/testdata/beku.db +++ b/testdata/beku.db @@ -1,3 +1,5 @@ +[beku] + [package "github.com/alecthomas/gometalinter"] vcs = git remote-name = origin |