change user-visible error to giveup

diff --git a/Annex/Fixup.hs b/Annex/Fixup.hs
index 38cb676a1c643b81a0590ea88944a35e35214952..8730b83230930f67d6dda7283bda157dd695c37d 100644 (file)
--- a/Annex/Fixup.hs
+++ b/Annex/Fixup.hs
@@ -116,7 +116,7 @@ fixupUnusualRepos r@(Repo { location = l@(Local { worktree = Just w, gitdir = d
                R.createSymbolicLink linktarget dotgit
        
        unsetcoreworktree =
-               maybe (error "unset core.worktree failed") (\_ -> return ())
+               maybe (giveup "unset core.worktree failed") (\_ -> return ())
                        =<< Git.Config.unset "core.worktree" r
        
        worktreefixup =