diff options
author | 2012-12-13 00:29:06 -0400 | |
---|---|---|
committer | 2012-12-13 00:29:06 -0400 | |
commit | de6406afce6de0cf8a48bc2ecf9be1e7de93e40e (patch) | |
tree | 08705fab60c11d4073734a8c2500a88b1aab7852 /Git/UpdateIndex.hs | |
parent | 3e55a8f164d67d5bd1ef86ae2f38fb2c6c3a51b2 (diff) | |
parent | 94554782894ec6c26da3b46312d5d1d16d596458 (diff) |
Merge branch 'master' into desymlink
Conflicts:
Annex/CatFile.hs
Annex/Content.hs
Git/LsFiles.hs
Git/LsTree.hs
Diffstat (limited to 'Git/UpdateIndex.hs')
-rw-r--r-- | Git/UpdateIndex.hs | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/Git/UpdateIndex.hs b/Git/UpdateIndex.hs index bc96570de..aa65b4429 100644 --- a/Git/UpdateIndex.hs +++ b/Git/UpdateIndex.hs @@ -38,12 +38,12 @@ streamUpdateIndex repo as = pipeWrite params repo $ \h -> do fileEncoding h forM_ as (stream h) hClose h - where - params = map Param ["update-index", "-z", "--index-info"] - stream h a = a (streamer h) - streamer h s = do - hPutStr h s - hPutStr h "\0" + where + params = map Param ["update-index", "-z", "--index-info"] + stream h a = a (streamer h) + streamer h s = do + hPutStr h s + hPutStr h "\0" {- A streamer that adds the current tree for a ref. Useful for eg, copying - and modifying branches. -} @@ -52,8 +52,8 @@ lsTree (Ref x) repo streamer = do (s, cleanup) <- pipeNullSplit params repo mapM_ streamer s void $ cleanup - where - params = map Param ["ls-tree", "-z", "-r", "--full-tree", x] + where + params = map Param ["ls-tree", "-z", "-r", "--full-tree", x] {- Generates a line suitable to be fed into update-index, to add - a given file with a given sha. -} |