summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* releasing package git-annex version 6.201705196.20170519Gravatar Joey Hess2017-05-19
|
* typoGravatar Joey Hess2017-05-19
|
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2017-05-19
|\
* | fix build failure w/o concurrent-outputGravatar Joey Hess2017-05-19
| | | | | | | | | | Also removed warning on old version, since the autobuilder highlights warnings as errors and this is too minor for that.
| * Added a comment: (compress/tar)ing the filesGravatar dav02.git@4d920fe040aa5df86fcd9f4dd57d3fcf85ee56412017-05-19
| |
| * Added a commentGravatar mario2017-05-19
| |
| * Added a commentGravatar leavingchicago@c04c893e78d1c4c76cb3e32b5c227cf42bbf76822017-05-19
| |
* | Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2017-05-18
|\|
| * (no commit message)Gravatar mario2017-05-18
| |
| * item in history -> single itemGravatar dav02.git@4d920fe040aa5df86fcd9f4dd57d3fcf85ee56412017-05-18
| |
| * (no commit message)Gravatar mario2017-05-18
| |
| * update linksGravatar dav02.git@4d920fe040aa5df86fcd9f4dd57d3fcf85ee56412017-05-18
| |
| * (no commit message)Gravatar dav02.git@4d920fe040aa5df86fcd9f4dd57d3fcf85ee56412017-05-18
| |
* | Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2017-05-17
|\|
| * Added a comment: p.s.Gravatar mario2017-05-17
| |
| * Added a comment: Hanging problem still thereGravatar mario2017-05-17
| |
* | avoid warning when the concurrent-output flag is disabledGravatar Joey Hess2017-05-16
|/
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2017-05-16
|\
* | run stack setup when building with stackGravatar Joey Hess2017-05-16
| | | | | | | | | | | | | | | | This gets ghc installed if it's not already. Motivation: Ævar's git test that runs git-annex test using git can be called with BUILDER=stack, but without stack setup being run sometime, the stack build will fail.
* | updateGravatar Joey Hess2017-05-16
| |
| * Added a comment: Encrypt to different subkeys?Gravatar Yurt2017-05-16
|/
* devblogGravatar Joey Hess2017-05-16
|
* clear regions before ssh promptGravatar Joey Hess2017-05-16
| | | | | | | | | | | When built with concurrent-output 1.9, ssh password prompts will no longer interfere with the -J display. To avoid flicker, only done when ssh actually does need to prompt; ssh is first run in batch mode and if that succeeds the connection is up and no need to clear regions. This commit was supported by the NSF-funded DataLad project.
* workaround is in placeGravatar Joey Hess2017-05-16
| | | | (and remove debug print)
* Work around bug in git 2.13.0 involving GIT_COMMON_DIR that broke merging ↵Gravatar Joey Hess2017-05-16
| | | | | | | | | | changes into adjusted branches. Might want to remove this when it gets fixed, in case adjusted branches are used in a repo with a great many refs, which would become unnecessarily slow. This commit was supported by the NSF-funded DataLad project.
* glacier-cli python3 bug nearly for sureGravatar Joey Hess2017-05-16
|
* forwardeed to git MLGravatar Joey Hess2017-05-16
|
* close dupGravatar Joey Hess2017-05-16
|
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2017-05-16
|\
* | bisectionGravatar Joey Hess2017-05-16
| |
* | optimisationGravatar Joey Hess2017-05-16
| | | | | | | | Avoids N^2 list traversal.
| * failing unit tests bugGravatar mail@4e627fd997ef5ca9f75e62ffc0aba5b27bd6aea12017-05-16
|/
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2017-05-16
|\
* | devblogGravatar Joey Hess2017-05-16
| |
* | adeiu, MissingHGravatar Joey Hess2017-05-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed dependency on MissingH, instead depending on the split library. After laying groundwork for this since 2015, it was mostly straightforward. Added Utility.Tuple and Utility.Split. Eyeballed System.Path.WildMatch while implementing the same thing. Since MissingH's progress meter display was being used, I re-implemented my own. Bonus: Now progress is displayed for transfers of files of unknown size. This commit was sponsored by Shane-o on Patreon.
* | stop using MissingH for MD5Gravatar Joey Hess2017-05-15
| | | | | | | | | | | | | | | | | | | | Cryptonite is faster and allocates less, and I want to get rid of MissingH use. Note that the new dependency on memory is free; it's a dependency of cryptonite. This commit was supported by the NSF-funded DataLad project.
* | rename prompt since Messages added a function by that nameGravatar Joey Hess2017-05-15
| |
* | remove absNormPathUnix againGravatar Joey Hess2017-05-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moving toward dropping MissingH dep. I think I've addressed the problem identified earlier in 7141943075211f9dd4959ca4c8b0a274f48dc9ff. On Windows, absPathFrom "/tmp/repo/xxx" "y/bar" would be "/tmp/repo/xxx\\y/bar", which then confuses relPathDirToFile. Fixed by converting to unix (git) style paths. Also, relPathDirToFile was splitting only on \\ on windows and not / which broke the example in 7141943075211f9dd4959ca4c8b0a274f48dc9ff of relPathDirToFile (absPathFrom "/tmp/repo/xxx" "y/bar") "/tmp/repo/.git/annex/objects/xxx" Now, on windows, that will yield "..\\..\\..\\.git/annex/objects/xxx" which once converted to unix style paths is what we want.
| * (no commit message)Gravatar http://id.clacke.se/2017-05-16
| |
* | add Other-Extensions: TemplateHaskellGravatar Joey Hess2017-05-15
| | | | | | | | | | Fixes a build failure of stack build --profile. See https://ghc.haskell.org/trac/ghc/ticket/8443
| * glacier-cli and git-annex doesn't seem to work together rightGravatar michal.anks@bff6982ee88f5bd889dd798be824cff38f2d89332017-05-15
| |
* | update to lts-8.13Gravatar Joey Hess2017-05-15
| |
| * (no commit message)Gravatar http://id.clacke.se/2017-05-15
| |
| * Added a comment: Related...Gravatar leavingchicago@c04c893e78d1c4c76cb3e32b5c227cf42bbf76822017-05-15
| |
| * (no commit message)Gravatar leavingchicago@c04c893e78d1c4c76cb3e32b5c227cf42bbf76822017-05-15
| |
| * Add missing backtick around codeGravatar justin.lebar@7a36fcafc322d9a381e89f08ab6289033c6dde912017-05-14
| |
| * Describe issue, actions done, question.Gravatar https://launchpad.net/~stephane-gourichon-lpad2017-05-14
| |
| * Added a comment: dtruss OS X 10.11 git annex on SMB mountGravatar ewen2017-05-14
| |
| * Added a commentGravatar t.z.mates2017-05-13
| |
* | also serialize ssh password prompting when json or quiet output is enableGravatar Joey Hess2017-05-13
|/