summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2011-01-04 17:34:14 -0400
committerGravatar Joey Hess <joey@kitenet.net>2011-01-04 17:34:14 -0400
commita857e1f4ee247cae0cf0ce6696a9015460d117de (patch)
tree927aaa1c0048fe50c04c5490e2bf48b8a6e0b0f6
parentb001e6573c09235f9d22cb4daf034369f6bff11b (diff)
git-annex-shell: Avoid exposing any git repo config except for the annex.uuid when doing configlist.
-rw-r--r--Command/ConfigList.hs5
-rw-r--r--debian/changelog7
2 files changed, 10 insertions, 2 deletions
diff --git a/Command/ConfigList.hs b/Command/ConfigList.hs
index 0d9d789b5..b91c2a916 100644
--- a/Command/ConfigList.hs
+++ b/Command/ConfigList.hs
@@ -11,7 +11,7 @@ import Control.Monad.State (liftIO)
import Annex
import Command
-import qualified GitRepo as Git
+import UUID
command :: [Command]
command = [Command "configlist" paramNothing seek
@@ -23,5 +23,6 @@ seek = [withNothing start]
start :: CommandStartNothing
start = do
g <- Annex.gitRepo
- liftIO $ Git.run g ["config", "--list"]
+ u <- getUUID g
+ liftIO $ putStrLn $ "annex.uuid=" ++ u
return Nothing
diff --git a/debian/changelog b/debian/changelog
index 12a2efaff..1c265f1be 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+git-annex (0.16) UNRELEASED; urgency=low
+
+ * git-annex-shell: Avoid exposing any git repo config except for the
+ annex.uuid when doing configlist.
+
+ -- Joey Hess <joeyh@debian.org> Tue, 04 Jan 2011 17:33:42 -0400
+
git-annex (0.15) unstable; urgency=low
* Support scp-style urls for remotes (host:path).