summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Annex/Branch.hs2
-rw-r--r--Git/UnionMerge.hs12
2 files changed, 7 insertions, 7 deletions
diff --git a/Annex/Branch.hs b/Annex/Branch.hs
index ae33f66cf..a75773e19 100644
--- a/Annex/Branch.hs
+++ b/Annex/Branch.hs
@@ -56,7 +56,7 @@ index g = gitAnnexDir g </> "index"
- and merge in changes from other branches.
-}
genIndex :: Git.Repo -> IO ()
-genIndex g = Git.UnionMerge.update_index_via g
+genIndex g = Git.UnionMerge.stream_update_index g
[Git.UnionMerge.ls_tree fullname g]
{- Runs an action using the branch's index file. -}
diff --git a/Git/UnionMerge.hs b/Git/UnionMerge.hs
index a2344e59d..60ccd6dcd 100644
--- a/Git/UnionMerge.hs
+++ b/Git/UnionMerge.hs
@@ -9,7 +9,7 @@ module Git.UnionMerge (
merge,
merge_index,
update_index,
- update_index_via,
+ stream_update_index,
update_index_line,
ls_tree
) where
@@ -30,7 +30,7 @@ import Git.CatFile
merge :: String -> String -> Repo -> IO ()
merge x y repo = do
h <- catFileStart repo
- update_index_via repo
+ stream_update_index repo
[ ls_tree x repo
, merge_trees x y h repo
]
@@ -40,19 +40,19 @@ merge x y repo = do
- the index are preserved (and participate in the merge). -}
merge_index :: CatFileHandle -> Repo -> [String] -> IO ()
merge_index h repo bs =
- update_index_via repo $ map (\b -> merge_tree_index b h repo) bs
+ stream_update_index repo $ map (\b -> merge_tree_index b h repo) bs
{- Feeds content into update-index. Later items in the list can override
- earlier ones, so the list can be generated from any combination of
- ls_tree, merge_trees, and merge_tree_index. -}
update_index :: Repo -> [String] -> IO ()
-update_index repo ls = update_index_via repo [\s -> mapM_ s ls]
+update_index repo ls = stream_update_index repo [\s -> mapM_ s ls]
type Streamer = (String -> IO ()) -> IO ()
{- Streams content into update-index. -}
-update_index_via :: Repo -> [Streamer] -> IO ()
-update_index_via repo as = do
+stream_update_index :: Repo -> [Streamer] -> IO ()
+stream_update_index repo as = do
(p, h) <- hPipeTo "git" (toCommand $ Git.gitCommandLine params repo)
forM_ as (stream h)
hClose h