summaryrefslogtreecommitdiff
path: root/Git
diff options
context:
space:
mode:
Diffstat (limited to 'Git')
-rw-r--r--Git/AutoCorrect.hs2
-rw-r--r--Git/CurrentRepo.hs2
-rw-r--r--Git/GCrypt.hs2
3 files changed, 3 insertions, 3 deletions
diff --git a/Git/AutoCorrect.hs b/Git/AutoCorrect.hs
index 7a9d78851..ae7cc91a8 100644
--- a/Git/AutoCorrect.hs
+++ b/Git/AutoCorrect.hs
@@ -50,7 +50,7 @@ prepare input showmatch matches r =
| otherwise -> sleep n
Nothing -> list
where
- list = error $ unlines $
+ list = giveup $ unlines $
[ "Unknown command '" ++ input ++ "'"
, ""
, "Did you mean one of these?"
diff --git a/Git/CurrentRepo.hs b/Git/CurrentRepo.hs
index dab4ad21b..69a679ee3 100644
--- a/Git/CurrentRepo.hs
+++ b/Git/CurrentRepo.hs
@@ -52,7 +52,7 @@ get = do
curr <- getCurrentDirectory
Git.Config.read $ newFrom $
Local { gitdir = absd, worktree = Just curr }
- configure Nothing Nothing = error "Not in a git repository."
+ configure Nothing Nothing = giveup "Not in a git repository."
addworktree w r = changelocation r $
Local { gitdir = gitdir (location r), worktree = w }
diff --git a/Git/GCrypt.hs b/Git/GCrypt.hs
index 2a2f7dfe1..e61b76358 100644
--- a/Git/GCrypt.hs
+++ b/Git/GCrypt.hs
@@ -46,7 +46,7 @@ encryptedRemote baserepo = go
u = show url
plen = length urlPrefix
go _ = notencrypted
- notencrypted = error "not a gcrypt encrypted repository"
+ notencrypted = giveup "not a gcrypt encrypted repository"
data ProbeResult = Decryptable | NotDecryptable | NotEncrypted