summaryrefslogtreecommitdiff
path: root/Remote/Git.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 /Remote/Git.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 'Remote/Git.hs')
-rw-r--r--Remote/Git.hs2
1 files changed, 1 insertions, 1 deletions
diff --git a/Remote/Git.hs b/Remote/Git.hs
index f27d17084..e527fa4fe 100644
--- a/Remote/Git.hs
+++ b/Remote/Git.hs
@@ -111,7 +111,7 @@ tryGitConfigRead r
withTempFile "git-annex.tmp" $ \tmpfile h -> do
hPutStr h s
hClose h
- pOpen ReadFromPipe "git" ["config", "--list", "--file", tmpfile] $
+ pOpen ReadFromPipe "git" ["config", "--null", "--list", "--file", tmpfile] $
Git.Config.hRead r
store a = do