ssh exit status 255 is a connection problem
Previously, when the git config was unable to be read from a ssh remote, it would try to git fetch from it to determine if the remote was otherwise accessible. That was unnessary work, since exit status 255 indicates a connection problem. As well as avoiding the extra work of the fetch, this also improves things when a ssh remote cannot be connected to due to a problem with the git-annex ssh control socket. In that situation, ssh will also exit 255. Before, the git fetch was tried in that situation, and would succeed, since it does not use the git-annex ssh control socket. git-annex would conclude that git-annex-shell was not installed on the remote, which could be wrong. I suppose it also used to be possible for the user to need to enter a ssh password on each connection to the remote. If they entered the wrong password for the git-annex-shell call, but then the right password for the git fetch, it would also incorrectly set annex-ignore, and that situation is also now fixed.
This commit is contained in:
parent
e8e36a90c1
commit
a19a3076b5
5 changed files with 79 additions and 38 deletions
|
@ -255,9 +255,9 @@ coreBare = "core.bare"
|
|||
|
||||
{- Runs a command to get the configuration of a repo,
|
||||
- and returns a repo populated with the configuration, as well as the raw
|
||||
- output and the standard error of the command. -}
|
||||
fromPipe :: Repo -> String -> [CommandParam] -> ConfigStyle -> IO (Either SomeException (Repo, S.ByteString, String))
|
||||
fromPipe r cmd params st = tryNonAsync $ withCreateProcess p go
|
||||
- output and the exit status and standard error of the command. -}
|
||||
fromPipe :: Repo -> String -> [CommandParam] -> ConfigStyle -> IO (Repo, S.ByteString, ExitCode, String)
|
||||
fromPipe r cmd params st = withCreateProcess p go
|
||||
where
|
||||
p = (proc cmd $ toCommand params)
|
||||
{ std_out = CreatePipe
|
||||
|
@ -267,9 +267,13 @@ fromPipe r cmd params st = tryNonAsync $ withCreateProcess p go
|
|||
withAsync (getstderr pid herr []) $ \errreader -> do
|
||||
val <- S.hGetContents hout
|
||||
err <- wait errreader
|
||||
forceSuccessProcess p pid
|
||||
r' <- store val st r
|
||||
return (r', val, err)
|
||||
exitcode <- waitForProcess pid
|
||||
case exitcode of
|
||||
ExitSuccess -> do
|
||||
r' <- store val st r
|
||||
return (r', val, exitcode, err)
|
||||
ExitFailure _ ->
|
||||
return (r, val, exitcode, err)
|
||||
go _ _ _ _ = error "internal"
|
||||
|
||||
getstderr pid herr c = hGetLineUntilExitOrEOF pid herr >>= \case
|
||||
|
@ -278,7 +282,7 @@ fromPipe r cmd params st = tryNonAsync $ withCreateProcess p go
|
|||
|
||||
{- Reads git config from a specified file and returns the repo populated
|
||||
- with the configuration. -}
|
||||
fromFile :: Repo -> FilePath -> IO (Either SomeException (Repo, S.ByteString, String))
|
||||
fromFile :: Repo -> FilePath -> IO (Repo, S.ByteString, ExitCode, String)
|
||||
fromFile r f = fromPipe r "git"
|
||||
[ Param "config"
|
||||
, Param "--file"
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue