summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Remote.hs3
-rw-r--r--debian/changelog2
2 files changed, 5 insertions, 0 deletions
diff --git a/Remote.hs b/Remote.hs
index 5dec6f3e5..b524a9f9e 100644
--- a/Remote.hs
+++ b/Remote.hs
@@ -231,6 +231,9 @@ showLocations key exclude nolocmsg = do
ppuuidswanted <- Remote.prettyPrintUUIDs "wanted" uuidswanted
ppuuidsskipped <- Remote.prettyPrintUUIDs "skipped" uuidsskipped
showLongNote $ message ppuuidswanted ppuuidsskipped
+ ignored <- filter (remoteAnnexIgnore . gitconfig) <$> remoteList
+ unless (null ignored) $
+ showLongNote $ "(Note that these git remotes have annex-ignore set: " ++ unwords (map name ignored) ++ ")"
where
filteruuids l x = filter (`notElem` x) l
message [] [] = nolocmsg
diff --git a/debian/changelog b/debian/changelog
index 0511fa950..0c001d33a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,6 +21,8 @@ git-annex (4.20130828) UNRELEASED; urgency=low
and disadvantages, but encryption=hybrid is the recommended scheme still.
(Thanks, guilhem for the patch.)
* Fix Feeds display in build flags.
+ * Remind user when annex-ignore is set for some remotes, if unable to
+ get or drop a file, possibly because it's on an ignored remote.
-- Joey Hess <joeyh@debian.org> Tue, 27 Aug 2013 11:03:00 -0400