diff options
| -rw-r--r-- | CHANGELOG | 4 | ||||
| -rw-r--r-- | CmdLine/GitAnnexShell.hs | 2 | ||||
| -rw-r--r-- | doc/bugs/sync_with_clone_protocol_error.mdwn | 2 |
3 files changed, 7 insertions, 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 diff --git a/CmdLine/GitAnnexShell.hs b/CmdLine/GitAnnexShell.hs index 70c86ec2f..154bfeb38 100644 --- a/CmdLine/GitAnnexShell.hs +++ b/CmdLine/GitAnnexShell.hs @@ -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 } diff --git a/doc/bugs/sync_with_clone_protocol_error.mdwn b/doc/bugs/sync_with_clone_protocol_error.mdwn index 47b61483c..2ae0cab42 100644 --- a/doc/bugs/sync_with_clone_protocol_error.mdwn +++ b/doc/bugs/sync_with_clone_protocol_error.mdwn @@ -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]] |