From cf6cf0d4b77386acbc4b742ab2cb471b2206f5ae Mon Sep 17 00:00:00 2001 From: Alexey Smirnov Date: Thu, 7 Feb 2019 14:48:32 +0500 Subject: worktree: add sentinel error for non-fast-forward pull Signed-off-by: Alexey Smirnov --- worktree_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'worktree_test.go') 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) { -- cgit