aboutsummaryrefslogtreecommitdiff
path: root/Command/Map.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2011-12-15 12:46:04 -0400
committerGravatar Joey Hess <joey@kitenet.net>2011-12-15 12:48:27 -0400
commit09cd04277577381464eddceb42558ad300c49378 (patch)
tree25413673497e639331c81fd0864b5ef0e394078a /Command/Map.hs
parentef28b3fef7e236d8c27ce35308c0e37ece58d20c (diff)
Properly handle multiline git config values.
A crash on parsing was fixed a while ago. This adds support for fully correctly parsing multiline git config values, using git config --null. Since git-annex-shell configlist uses normal git config output, I left in support for that too; the two forms of config output can be easily identified by the parser. Since configlist only prints the annex.uuid config, there's no risk of multiline values there, so no need to change it.
Diffstat (limited to 'Command/Map.hs')
-rw-r--r--Command/Map.hs2
1 files changed, 1 insertions, 1 deletions
diff --git a/Command/Map.hs b/Command/Map.hs
index ae8a69404..15ca5e149 100644
--- a/Command/Map.hs
+++ b/Command/Map.hs
@@ -203,7 +203,7 @@ tryScan r
liftIO $ pipedconfig "ssh" sshparams
where
sshcmd = cddir ++ " && " ++
- "git config --list"
+ "git config --null --list"
dir = Git.workTree r
cddir
| "/~" `isPrefixOf` dir =