diff options
| author | Joey Hess <joey@kitenet.net> | 2014-07-21 16:35:23 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-07-21 16:35:23 -0400 |
| commit | 619c8bd261a4fee0b0d40b664e55c51782e062f7 (patch) | |
| tree | ba39cd283d4c0fecb61c7a1bbbb803cc9459a222 /Git/LsFiles.hs | |
| parent | 7882653e7856df87e598464379951ec89775cd1a (diff) | |
| download | git-repair-619c8bd261a4fee0b0d40b664e55c51782e062f7.tar.gz | |
Merge from git-annex.
Diffstat (limited to 'Git/LsFiles.hs')
| -rw-r--r-- | Git/LsFiles.hs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Git/LsFiles.hs b/Git/LsFiles.hs index e155845..2aa05ba 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) |