diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-11-14 17:04:58 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-11-14 17:04:58 -0400 |
| commit | 521ef9dfebd6a9418a5dce7d1686dbf353ddd0a0 (patch) | |
| tree | afe6bb5d52e21a049f04020ae448afb81adc02a7 /Annex/CheckIgnore.hs | |
| parent | f4b4f327b69189d24663a7db6407c1f7a6e48fdd (diff) | |
| parent | 5c6f6e4d0abb9b4856908a500611044b3b7a48e6 (diff) | |
Merge branch 'master' into tasty-tests
Conflicts:
Test.hs
Diffstat (limited to 'Annex/CheckIgnore.hs')
| -rw-r--r-- | Annex/CheckIgnore.hs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Annex/CheckIgnore.hs b/Annex/CheckIgnore.hs index e5626557d..d45e652bc 100644 --- a/Annex/CheckIgnore.hs +++ b/Annex/CheckIgnore.hs @@ -25,7 +25,7 @@ checkIgnoreHandle :: Annex (Maybe Git.CheckIgnoreHandle) checkIgnoreHandle = maybe startup return =<< Annex.getState Annex.checkignorehandle where startup = do - v <- inRepo $ Git.checkIgnoreStart + v <- inRepo Git.checkIgnoreStart when (isNothing v) $ warning "The installed version of git is too old for .gitignores to be honored by git-annex." Annex.changeState $ \s -> s { Annex.checkignorehandle = Just v } |