Avoid backtraces on expected failures when built with ghc 8; only use backtraces for unexpected errors.
ghc 8 added backtraces on uncaught errors. This is great, but git-annex was using error in many places for a error message targeted at the user, in some known problem case. A backtrace only confuses such a message, so omit it. Notably, commands like git annex drop that failed due to eg, numcopies, used to use error, so had a backtrace. This commit was sponsored by Ethan Aubin.
This commit is contained in:
parent
69915c6c9b
commit
0a4479b8ec
116 changed files with 287 additions and 270 deletions
|
@ -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?"
|
||||
|
|
|
@ -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 }
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue