mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

show a much longer message when annex-ignore is automatically set, to help the user fix their problem

Browse source
This commit is contained in:
Joey Hess 2014-05-16 12:58:50 -04:00
parent 3653920c18
commit 0b899fa2f1
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
Remote/Git.hs
View file

@ -197,7 +197,7 @@ tryGitConfigRead r
)
case v of
Left _ -> do
set_ignore "not usable by git-annex"
set_ignore "not usable by git-annex" False
return r
Right r' -> do
-- Cache when http remote is not bare for
@ -225,15 +225,18 @@ tryGitConfigRead r
configlist_failed = case Git.remoteName r of
Nothing -> return r
Just n -> do
whenM (inRepo $ Git.Command.runBool [Param "fetch", Param "--quiet", Param n]) $
set_ignore "does not have git-annex installed"
whenM (inRepo $ Git.Command.runBool [Param "fetch", Param "--quiet", Param n]) $ do
set_ignore "does not have git-annex installed" True
return r
set_ignore msg = do
set_ignore msg longmessage = do
let k = "annex-ignore"
case Git.remoteName r of
Nothing -> noop
Just n -> warning $ "Remote " ++ n ++ " " ++ msg ++ "; setting " ++ k
Just n -> do
warning $ "Remote " ++ n ++ " " ++ msg ++ "; setting " ++ k
when longmessage $
warning $ "This could be a problem with the git-annex installation on the remote. Please make sure that git-annex-shell is available in PATH when you ssh into the remote. Once you have fixed the git-annex installation, run: git config remote." ++ n ++ "." ++ k ++ " false"
setremote k (Git.Config.boolConfig True)
setremote k v = case Git.remoteName r of