fix a case where file tracked by git unexpectedly becomes annex pointer file
smudge: When annex.largefiles=anything, files that were already stored in git, and have not been modified could sometimes be converted to being stored in the annex. Changes in 7.20191024 made this more of a problem. This case is now detected and prevented.
This commit is contained in:
parent
b9481c6ba0
commit
ea3cb7d277
10 changed files with 90 additions and 34 deletions
|
@ -31,7 +31,7 @@ import Git.FilePath
|
|||
-}
|
||||
merge :: Ref -> Ref -> Repo -> IO ()
|
||||
merge x y repo = do
|
||||
hashhandle <- hashObjectStart repo
|
||||
hashhandle <- hashObjectStart True repo
|
||||
ch <- catFileStart repo
|
||||
streamUpdateIndex repo
|
||||
[ lsTree x repo
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue