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

workaround is in place

Browse source 
(and remove debug print)
This commit is contained in:
Joey Hess 2017-05-16 14:36:37 -04:00
parent 9bcaef1ec4
commit 89f9be3230
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
2 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Annex/AdjustedBranch.hs
View file

@ -369,7 +369,6 @@ updateAdjustedBranch tomerge (origbranch, adj) mergeconfig commitmode = catchBoo
liftIO $ forM_ refs' $ \src -> liftIO $ forM_ refs' $ \src ->
whenM (doesFileExist src) $ do whenM (doesFileExist src) $ do
dest <- relPathDirToFile git_dir src dest <- relPathDirToFile git_dir src
print (src, dest)
let dest' = tmpgit </> dest let dest' = tmpgit </> dest
createDirectoryIfMissing True (takeDirectory dest') createDirectoryIfMissing True (takeDirectory dest')
void $ createLinkOrCopy src dest' void $ createLinkOrCopy src dest'

2
doc/bugs/git-annex_in_nixpkgs_fails_with_git-2.13.0.mdwn
View file

@ -355,3 +355,5 @@ FAIL (1.50s)
### Have you had any luck using git-annex before? (Sometimes we get tired of reading bug reports all day and a lil' positive end note does wonders) ### Have you had any luck using git-annex before? (Sometimes we get tired of reading bug reports all day and a lil' positive end note does wonders)
git-annex is an essential building block in my digital life style! It keeps backups of all my precious family photos. I'm a big git-annex shill when I get the chance, especially to nix, guix and decentralized hacker types. git-annex is an essential building block in my digital life style! It keeps backups of all my precious family photos. I'm a big git-annex shill when I get the chance, especially to nix, guix and decentralized hacker types.
> Workaround is in [[!commit 9bcaef1ec496b4ffd3033ae5080949bd8cc3edd5]]. [[done]] --[[Joey]]