From 3847aa3c9cf1c41d25e094e3edf270d7bf903fad Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 21 Jan 2021 14:13:14 -0400 Subject: [PATCH] change user-visible error to giveup --- Annex/Fixup.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Annex/Fixup.hs b/Annex/Fixup.hs index 38cb676a1c..8730b83230 100644 --- 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 = -- 2.30.2