diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2016-12-07 14:32:25 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-12-07 14:32:25 -0400 |
| commit | 9350f8871f5498a34c99bed209799b9fbb6391d3 (patch) | |
| tree | 369db25e472126dbea8feeb7ec70dbca404da66c /Command/Add.hs | |
| parent | 51b648ac6e11d0d5a9e617e45d236bd850894285 (diff) | |
| parent | 3500fa70e016459fcd02cba4d4c3059e7f4555ef (diff) | |
Merge branch 'master' into tor
Diffstat (limited to 'Command/Add.hs')
| -rw-r--r-- | Command/Add.hs | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/Command/Add.hs b/Command/Add.hs index eeaaf5d34..f9cfbb9a1 100644 --- a/Command/Add.hs +++ b/Command/Add.hs @@ -41,9 +41,6 @@ optParser desc = AddOptions ) <*> parseBatchOption -{- Add acts on both files not checked into git yet, and unlocked files. - - - - In direct mode, it acts on any files that have changed. -} seek :: AddOptions -> CommandSeek seek o = allowConcurrentOutput $ do matcher <- largeFilesMatcher @@ -59,10 +56,9 @@ seek o = allowConcurrentOutput $ do NoBatch -> do let go a = a gofile (addThese o) go (withFilesNotInGit (not $ includeDotFiles o)) - ifM (versionSupportsUnlockedPointers <||> isDirect) - ( go withFilesMaybeModified - , go withFilesOldUnlocked - ) + go withFilesMaybeModified + unlessM (versionSupportsUnlockedPointers <||> isDirect) $ + go withFilesOldUnlocked {- Pass file off to git-add. -} startSmall :: FilePath -> CommandStart |