mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

in v6 mode, unannex does not interact badly with pre-commit hook

Browse source 
So can be used in a tree with staged changes, no problems. Much nicer.
This commit is contained in:
Joey Hess 2015-12-15 16:18:39 -04:00
parent 99f1d7991d
commit b9588fe69e
Failed to extract signature
1 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Command/Unannex.hs
View file

@ -15,6 +15,7 @@ import Config
import qualified Annex import qualified Annex
import Annex.Content import Annex.Content
import Annex.Content.Direct import Annex.Content.Direct
import Annex.Version
import qualified Git.Command import qualified Git.Command
import qualified Git.Branch import qualified Git.Branch
import qualified Git.Ref import qualified Git.Ref
@ -32,7 +33,7 @@ seek :: CmdParams -> CommandSeek
seek = wrapUnannex . (withFilesInGit $ whenAnnexed start) seek = wrapUnannex . (withFilesInGit $ whenAnnexed start)
wrapUnannex :: Annex a -> Annex a wrapUnannex :: Annex a -> Annex a
wrapUnannex a = ifM isDirect wrapUnannex a = ifM (versionSupportsUnlockedPointers <||> isDirect)
( a ( a
{- Run with the pre-commit hook disabled, to avoid confusing {- Run with the pre-commit hook disabled, to avoid confusing
- behavior if an unannexed file is added back to git as - behavior if an unannexed file is added back to git as