diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2017-03-17 12:28:08 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2017-03-17 12:32:43 -0400 |
| commit | d345e7220e33a744765ed6f5caf8be5014712671 (patch) | |
| tree | b2b0e9f5821c47553238b8add4ffc0e130d902dd /CmdLine | |
| parent | 2e22df59273ddb39ea8f5545e8ac4830a4a31b7c (diff) | |
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
Diffstat (limited to 'CmdLine')
| -rw-r--r-- | CmdLine/GitAnnexShell.hs | 2 |
1 files changed, 1 insertions, 1 deletions
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 } |