diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2017-05-16 14:36:37 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2017-05-16 14:36:54 -0400 |
| commit | 68b490cd2863ef39b9c478a9da566802f3cccb1d (patch) | |
| tree | e6645f9efeea8795a344bf0232b276091c995b01 | |
| parent | 2e77647c6da30b15bcbb37c64f934fbd1a1efdf8 (diff) | |
workaround is in place
(and remove debug print)
| -rw-r--r-- | Annex/AdjustedBranch.hs | 1 | ||||
| -rw-r--r-- | doc/bugs/git-annex_in_nixpkgs_fails_with_git-2.13.0.mdwn | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/Annex/AdjustedBranch.hs b/Annex/AdjustedBranch.hs index 43677d779..c0225540a 100644 --- a/Annex/AdjustedBranch.hs +++ b/Annex/AdjustedBranch.hs @@ -369,7 +369,6 @@ updateAdjustedBranch tomerge (origbranch, adj) mergeconfig commitmode = catchBoo liftIO $ forM_ refs' $ \src -> whenM (doesFileExist src) $ do dest <- relPathDirToFile git_dir src - print (src, dest) let dest' = tmpgit </> dest createDirectoryIfMissing True (takeDirectory dest') void $ createLinkOrCopy src dest' diff --git a/doc/bugs/git-annex_in_nixpkgs_fails_with_git-2.13.0.mdwn b/doc/bugs/git-annex_in_nixpkgs_fails_with_git-2.13.0.mdwn index 2d3eebe51..53e12b5fc 100644 --- a/doc/bugs/git-annex_in_nixpkgs_fails_with_git-2.13.0.mdwn +++ b/doc/bugs/git-annex_in_nixpkgs_fails_with_git-2.13.0.mdwn @@ -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) 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]] |