mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

rawfilepath conversion

Browse source
This commit is contained in:
Joey Hess 2023-02-27 15:02:53 -04:00
parent cc32e31161
commit f09e299156
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
6 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Annex/Branch.hs
View file

@ -844,7 +844,7 @@ performTransitionsLocked jl ts neednewlocalbranch transitionedrefs = do
if L.null content'
then do
Annex.Queue.addUpdateIndex
=<< inRepo (Git.UpdateIndex.unstageFile (fromRawFilePath file))
=<< inRepo (Git.UpdateIndex.unstageFile file)
-- File is deleted; can't run any other
-- transitions on it.
return ()

2
Annex/Link.hs
View file

@ -138,7 +138,7 @@ hashPointerFile key = hashBlob $ formatPointer key
stagePointerFile :: RawFilePath -> Maybe FileMode -> Sha -> Annex ()
stagePointerFile file mode sha =
Annex.Queue.addUpdateIndex =<<
inRepo (Git.UpdateIndex.stageFile sha treeitemtype $ fromRawFilePath file)
inRepo (Git.UpdateIndex.stageFile sha treeitemtype file)
where
treeitemtype
| maybe False isExecutable mode = TreeExecutable