git-annex-shell: run all commands with noMessages
Fix bug when used with a recently cloned repository, where "merging" messages were included in the output of configlist (and perhaps other commands) and caused a "Failed to get annex.uuid configuration" error. This does not seem to have been a reversion. I saw this with configlist, but it seems possible for other commands to be effected, and it might not always happen only after a fresh clone. Eg, if a foo/git-annex branch is pushed to the remote, the next git-annex-shell will auto-merge it and display the message. Decided to run all git-annex-shell commands with noMessages, even ones that don't currently use stdout for structured communication. Better to keep open the possibility for using stdout in the future. This commit was supported by the NSF-funded DataLad project
This commit is contained in:
parent
6f082a3d56
commit
999743c1e8
3 changed files with 7 additions and 1 deletions
|
@ -17,6 +17,10 @@ git-annex (6.20170301.2) UNRELEASED; urgency=medium
|
|||
directory, feed, and http-types.
|
||||
* Windows: Fix bug in shell script shebang lookup code that
|
||||
caused a "delayed read on closed handle" error.
|
||||
* git-annex-shell: Fix bug when used with a recently cloned repository,
|
||||
where "merging" messages were included in the output of configlist
|
||||
(and perhaps other commands) and caused a "Failed to get annex.uuid
|
||||
configuration" error.
|
||||
|
||||
-- Joey Hess <id@joeyh.name> Thu, 02 Mar 2017 12:51:40 -0400
|
||||
|
||||
|
|
|
@ -48,7 +48,7 @@ cmds_notreadonly =
|
|||
]
|
||||
|
||||
cmds :: [Command]
|
||||
cmds = map adddirparam $ cmds_readonly ++ cmds_notreadonly
|
||||
cmds = map (adddirparam . noMessages) (cmds_readonly ++ cmds_notreadonly)
|
||||
where
|
||||
adddirparam c = c { cmdparamdesc = "DIRECTORY " ++ cmdparamdesc c }
|
||||
|
||||
|
|
|
@ -11,3 +11,5 @@ Next git-annex sync clam worked ok and got the UUID.
|
|||
|
||||
clam has git-annex 6.20170101 installed.
|
||||
--[[Joey]]
|
||||
|
||||
> [[fixed|done]] --[[Joey]]
|
||||
|
|
Loading…
Add table
Reference in a new issue