summaryrefslogtreecommitdiff
path: root/Git/LsFiles.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2014-06-10 19:20:14 -0400
committerGravatar Joey Hess <joey@kitenet.net>2014-06-10 19:20:14 -0400
commit899f84a217681833146fadd8f30cd25ed1a9f653 (patch)
tree37351958f69f8afef17b96966a30ca2dde79ba1c /Git/LsFiles.hs
parent465c36e8f6a45b888e8f7be8baa52f0eb1759f77 (diff)
export CreateProcess fields from Utility.Process
update code to avoid cwd and env redefinition warnings
Diffstat (limited to 'Git/LsFiles.hs')
-rw-r--r--Git/LsFiles.hs4
1 files changed, 2 insertions, 2 deletions
diff --git a/Git/LsFiles.hs b/Git/LsFiles.hs
index e1558456f..2aa05ba7f 100644
--- a/Git/LsFiles.hs
+++ b/Git/LsFiles.hs
@@ -132,8 +132,8 @@ typeChanged' ps l repo = do
-- git diff returns filenames relative to the top of the git repo;
-- convert to filenames relative to the cwd, like git ls-files.
let top = repoPath repo
- cwd <- getCurrentDirectory
- return (map (\f -> relPathDirToFile cwd $ top </> f) fs, cleanup)
+ currdir <- getCurrentDirectory
+ return (map (\f -> relPathDirToFile currdir $ top </> f) fs, cleanup)
where
prefix = [Params "diff --name-only --diff-filter=T -z"]
suffix = Param "--" : (if null l then [File "."] else map File l)