From bb16a261099e77f6d79c959547f9a9f36e00c7d0 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 19 Aug 2019 11:12:19 -0400 Subject: [PATCH] use headExists Turns out that 7be690f326da3a93b44dabc824d433246a8f502a broke the test suite on the i386ancient builder. There, git show-ref --verify HEAD fails with "'HEAD' - not a valid ref". Apparently git 2.1.4 didn't support that. headExists works there and does the same thing. --- Annex/WorkTree.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Annex/WorkTree.hs b/Annex/WorkTree.hs index 1cfa97a10d..419118f0ed 100644 --- a/Annex/WorkTree.hs +++ b/Annex/WorkTree.hs @@ -78,7 +78,7 @@ ifAnnexed file yes no = maybe no yes =<< lookupFile file - an annex object. If so, make the unlocked file use that content. -} scanUnlockedFiles :: Annex () -scanUnlockedFiles = whenM (inRepo $ Git.Ref.exists Git.Ref.headRef) $ do +scanUnlockedFiles = whenM (inRepo Git.Ref.headExists) $ do showSideAction "scanning for unlocked files" Database.Keys.runWriter $ liftIO . Database.Keys.SQL.dropAllAssociatedFiles