diff options
| author | Joey Hess <joeyh@joeyh.name> | 2020-05-04 15:38:39 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2020-05-04 15:38:39 -0400 |
| commit | 8c4352a0a544b2e5a4ed717999fc7c6ecb0a328f (patch) | |
| tree | d57aca56117598b06bf30e5a1ed96f4b77e51f09 /Git/FilePath.hs | |
| parent | 6ea7eac330f73699d965cef7b8ee23d7218415a8 (diff) | |
| download | git-repair-8c4352a0a544b2e5a4ed717999fc7c6ecb0a328f.tar.gz | |
merge from git-annex
* Improve fetching from a remote with an url in host:path format.
* Merge from git-annex.
Diffstat (limited to 'Git/FilePath.hs')
| -rw-r--r-- | Git/FilePath.hs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Git/FilePath.hs b/Git/FilePath.hs index 66a0159..d31b421 100644 --- a/Git/FilePath.hs +++ b/Git/FilePath.hs @@ -50,7 +50,7 @@ data BranchFilePath = BranchFilePath Ref TopFilePath {- Git uses the branch:file form to refer to a BranchFilePath -} descBranchFilePath :: BranchFilePath -> S.ByteString descBranchFilePath (BranchFilePath b f) = - encodeBS' (fromRef b) <> ":" <> getTopFilePath f + fromRef' b <> ":" <> getTopFilePath f {- Path to a TopFilePath, within the provided git repo. -} fromTopFilePath :: TopFilePath -> Git.Repo -> RawFilePath |