diff options
| author | Máximo Cuadros <mcuadros@gmail.com> | 2019-02-08 10:02:03 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-08 10:02:03 +0100 |
| commit | dcc9f375f4daedfef61e7ff2fbbfd851d42a72d8 (patch) | |
| tree | 494c22eb8c3b678e2f926614ef7d54fa46cbf663 /worktree_test.go | |
| parent | 00629a1f26e668d0da503455e2a61d7107da3160 (diff) | |
| parent | cf6cf0d4b77386acbc4b742ab2cb471b2206f5ae (diff) | |
| download | go-git-dcc9f375f4daedfef61e7ff2fbbfd851d42a72d8.tar.gz | |
Merge pull request #1064 from asv/sentinel_error_for_no_ff_update
worktree: add sentinel error for non-fast-forward pull
Diffstat (limited to 'worktree_test.go')
| -rw-r--r-- | worktree_test.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/worktree_test.go b/worktree_test.go index c714011..26b7da0 100644 --- a/worktree_test.go +++ b/worktree_test.go @@ -119,7 +119,7 @@ func (s *WorktreeSuite) TestPullNonFastForward(c *C) { c.Assert(err, IsNil) err = w.Pull(&PullOptions{}) - c.Assert(err, ErrorMatches, "non-fast-forward update") + c.Assert(err, Equals, ErrNonFastForwardUpdate) } func (s *WorktreeSuite) TestPullUpdateReferencesIfNeeded(c *C) { |