summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2015-04-09 12:28:26 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2015-04-09 12:28:26 -0400
commitb53c9e16064db874fa39b128e79810aaea63b4f6 (patch)
treea02ef52bb66a77d3aad936b071b94a9ce780a48a
parent380ca13a2b63a4499a6defbdea731d1e547fc702 (diff)
info: Display repository mode: bare when in a bare (non-direct mode) repo.
-rw-r--r--Command/Info.hs7
-rw-r--r--debian/changelog2
2 files changed, 8 insertions, 1 deletions
diff --git a/Command/Info.hs b/Command/Info.hs
index e489db0ea..db5953050 100644
--- a/Command/Info.hs
+++ b/Command/Info.hs
@@ -238,7 +238,12 @@ showStat s = maybe noop calc =<< s
repository_mode :: Stat
repository_mode = simpleStat "repository mode" $ lift $
ifM isDirect
- ( return "direct", return "indirect" )
+ ( return "direct"
+ , ifM (fromRepo Git.repoIsLocalBare)
+ ( return "bare"
+ , return "indirect"
+ )
+ )
remote_list :: TrustLevel -> Stat
remote_list level = stat n $ nojson $ lift $ do
diff --git a/debian/changelog b/debian/changelog
index cd12c7e79..9ef48e01f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,8 @@ git-annex (5.20150406.2) UNRELEASED; urgency=medium
behavior is more useful in direct mode.
* proxy: Made it work when run in a new repository before initial
commit.
+ * info: Display repository mode: bare when in a bare (non-direct mode)
+ repo.
-- Joey Hess <id@joeyh.name> Mon, 06 Apr 2015 20:14:20 -0400