summaryrefslogtreecommitdiff
path: root/Annex
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2015-07-06 14:21:43 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2015-07-06 14:21:43 -0400
commit620118676391dbd0b296db4d4bf28574c18b9a3c (patch)
treef96b0b51166c531bfc8d75a9f5bce0557f2cc3b0 /Annex
parent2ea34c47dd9819111f3cbaa2ce848581d286c05c (diff)
refactor ls-tree params
All in one place to avoid bugs like 2ea34c47dd9819111f3cbaa2ce848581d286c05c
Diffstat (limited to 'Annex')
-rw-r--r--Annex/Branch.hs11
1 files changed, 3 insertions, 8 deletions
diff --git a/Annex/Branch.hs b/Annex/Branch.hs
index 286eb0558..c6c9b9949 100644
--- a/Annex/Branch.hs
+++ b/Annex/Branch.hs
@@ -43,6 +43,7 @@ import qualified Git.Sha
import qualified Git.Branch
import qualified Git.UnionMerge
import qualified Git.UpdateIndex
+import Git.LsTree (lsTreeParams)
import Git.HashObject
import Git.Types
import Git.FilePath
@@ -314,14 +315,8 @@ files = do
{- Files in the branch, not including any from journalled changes,
- and without updating the branch. -}
branchFiles :: Annex [FilePath]
-branchFiles = withIndex $ inRepo $ Git.Command.pipeNullSplitZombie
- [ Param "ls-tree"
- , Param "--full-tree"
- , Param "--name-only"
- , Param "-r"
- , Param "-z"
- , Param $ fromRef fullname
- ]
+branchFiles = withIndex $ inRepo $ Git.Command.pipeNullSplitZombie $
+ lsTreeParams fullname [Param "--name-only"]
{- Populates the branch's index file with the current branch contents.
-