summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2011-05-28 22:28:14 -0400
committerGravatar Joey Hess <joey@kitenet.net>2011-05-28 22:30:06 -0400
commit14ffb5d47bdb07e8263a2112b1634b403a299005 (patch)
tree338b484a54d57e63b93c40d3cbc0ec04beea0dfb
parent66a99d3740d5996d328424c9492ed83fc36a77e4 (diff)
bugfix: fix unused list numbering
-rw-r--r--Command/Unused.hs2
-rw-r--r--debian/changelog6
2 files changed, 7 insertions, 1 deletions
diff --git a/Command/Unused.hs b/Command/Unused.hs
index 08f0148dc..96001683d 100644
--- a/Command/Unused.hs
+++ b/Command/Unused.hs
@@ -57,7 +57,7 @@ checkUnused = do
let unusedlist = number c l
when (not $ null l) $ showLongNote $ msg unusedlist
writeUnusedFile file unusedlist
- return $ length l
+ return $ c + length l
checkRemoteUnused :: String -> CommandPerform
checkRemoteUnused name = do
diff --git a/debian/changelog b/debian/changelog
index 991244a88..13b53280b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+git-annex (0.20110523) UNRELEASED; urgency=low
+
+ * Minor bugfixes and error message improvements.
+
+ -- Joey Hess <joeyh@debian.org> Sat, 28 May 2011 22:29:37 -0400
+
git-annex (0.20110522) unstable; urgency=low
* Closer emulation of git's behavior when told to use "foo/.git" as a