From 0ca85a94283a0ec067fc498747f246ef63dce993 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 3 Aug 2012 23:51:49 -0400 Subject: Revert "init: If no description is provided for a new repository, one will automatically be generated, like "joey@gnu:~/foo"" This reverts commit abde98cda21d5deeb16ed3baf736b06fdc2fce2f. Temporarily dropping from master, since this actually uses stuff that's only currently availble in the assistant branch. Will come back when I merge that, and can wait.. --- debian/changelog | 2 -- 1 file changed, 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 081d1ac9f..82bf5009a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,8 +2,6 @@ git-annex (3.20120722) UNRELEASED; urgency=low * initremote: Avoid recording remote's description before checking that its config is valid. - * init: If no description is provided for a new repository, one will - automatically be generated, like "joey@gnu:~/foo" -- Joey Hess Fri, 27 Jul 2012 21:04:47 -0400 -- cgit v1.2.3 From b885c0c6c8faa0c56e5f8cbdaa031652df6b26b4 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 5 Aug 2012 15:01:26 -0400 Subject: unused, status: Avoid crashing when ran in bare repo. --- Command/Unused.hs | 9 ++++++--- debian/changelog | 1 + 2 files changed, 7 insertions(+), 3 deletions(-) (limited to 'debian') diff --git a/Command/Unused.hs b/Command/Unused.hs index b115eee83..09b4be5df 100644 --- a/Command/Unused.hs +++ b/Command/Unused.hs @@ -229,9 +229,12 @@ withKeysReferencedM a = withKeysReferenced' () calla withKeysReferenced' :: v -> (Key -> v -> Annex v) -> Annex v withKeysReferenced' initial a = go initial =<< files where - files = do - top <- fromRepo Git.repoPath - inRepo $ LsFiles.inRepo [top] + files = ifM isBareRepo + ( return [] + , do + top <- fromRepo Git.repoPath + inRepo $ LsFiles.inRepo [top] + ) go v [] = return v go v (f:fs) = do x <- Backend.lookupFile f diff --git a/debian/changelog b/debian/changelog index 82bf5009a..9b2ff3f14 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ git-annex (3.20120722) UNRELEASED; urgency=low * initremote: Avoid recording remote's description before checking that its config is valid. + * unused, status: Avoid crashing when ran in bare repo. -- Joey Hess Fri, 27 Jul 2012 21:04:47 -0400 -- cgit v1.2.3