summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* experimental ipfs special remote, with addurl supportGravatar Joey Hess2015-03-05
|
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2015-03-04
|\
* | updateGravatar Joey Hess2015-03-04
| |
* | add end-user view sectionGravatar Joey Hess2015-03-04
| |
| * doc/devblog/day_260__random_month.mdwn: TypoGravatar Richard Hartmann2015-03-04
|/
* devblogGravatar Joey Hess2015-03-04
|
* fixup annex link target calculation when submodules are used in filesystems ↵Gravatar Joey Hess2015-03-04
| | | | not supporting symlinks
* avoid checking location of content when calculating gitAnnexLinkGravatar Joey Hess2015-03-04
| | | | | | | It doesn't matter if the object is present or not, gitAnnexLink should always yield the same symlink target. This is an optimisation; no behavior should be changed.
* sync: Fix committing when in a direct mode repo that has no HEAD ref.Gravatar Joey Hess2015-03-04
| | | | | | | | Seen for example, a newly checked out git submodule. In this case, .git/HEAD is a raw sha, rather than the usual reference to a ref. Removed currentSha in passing, since it was a more roundabout way of doing what headSha does, and headSha is more robust.
* fix innaccurate commentGravatar Joey Hess2015-03-04
|
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2015-03-04
|\
* | metadata: Fix encoding problem that led to mojibake when storing metadata ↵Gravatar Joey Hess2015-03-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | strings that contained both unicode characters and a space (or '!') character. The fix is to stop using w82s, which does not properly reconstitute unicode strings. Instrad, use utf8 bytestring to get the [Word8] to base64. This passes unicode through perfectly, including any invalid filesystem encoded characters. Note that toB64 / fromB64 are also used for creds and cipher embedding. It would be unfortunate if this change broke those uses. For cipher embedding, note that ciphers can contain arbitrary bytes (should really be using ByteString.Char8 there). Testing indicated it's not safe to use the new fromB64 there; I think that characters were incorrectly combined. For credpair embedding, the username or password could contain unicode. Before, that unicode would fail to round-trip through the b64. So, I guess this is not going to break any embedded creds that worked before. This bug may have affected some creds before, and if so, this change will not fix old ones, but should fix new ones at least.
| * Added a commentGravatar Rasmus2015-03-04
|/
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2015-03-04
|\
* | commentGravatar Joey Hess2015-03-04
| |
| * (no commit message)Gravatar madduck2015-03-04
|/
* groupsGravatar Joey Hess2015-03-03
|
* typoGravatar Joey Hess2015-03-03
|
* clarificationGravatar Joey Hess2015-03-03
|
* updateGravatar Joey Hess2015-03-03
|
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2015-03-03
|\
* | updateGravatar Joey Hess2015-03-03
| |
* | thundering herdGravatar Joey Hess2015-03-03
| |
* | updateGravatar Joey Hess2015-03-03
| |
* | item splittingGravatar Joey Hess2015-03-03
| |
* | updateGravatar Joey Hess2015-03-03
| |
| * (no commit message)Gravatar rasmus2015-03-04
|/
* clarifyGravatar Joey Hess2015-03-03
|
* drillGravatar Joey Hess2015-03-03
|
* linkGravatar Joey Hess2015-03-03
|
* linkGravatar Joey Hess2015-03-03
|
* clarifyGravatar Joey Hess2015-03-03
|
* updateGravatar Joey Hess2015-03-03
|
* devblogGravatar Joey Hess2015-03-03
|
* commentGravatar Joey Hess2015-03-03
|
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2015-03-03
|\
* | addGravatar Joey Hess2015-03-03
| |
| * Added a comment: window manager on 1st machineGravatar https://www.google.com/accounts/o8/id?id=AItOawmN1fkq65FL5gtBB6qFmEKWiyl20OutvDI2015-03-03
| |
| * Added a commentGravatar markusk2015-03-03
|/
* (no commit message)Gravatar Rasmus2015-03-03
|
* poll vote (Amazon Glacier (done))Gravatar 92.129.194.192015-03-03
|
* poll vote (Amazon S3 (done))Gravatar 92.129.194.192015-03-03
|
* (no commit message)Gravatar https://www.google.com/accounts/o8/id?id=AItOawksOCeakibYmGDt3wLLo4nkY0FkB72I2Uo2015-03-03
|
* Merge branch 'master' of ssh://git-annex.branchable.comGravatar Joey Hess2015-03-02
|\
* | devblogGravatar Joey Hess2015-03-02
| |
* | Submodules are now supported by git-annex!Gravatar Joey Hess2015-03-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Seems to work, but still experimental until it's been tested more. When repositories are on filesystems not supporting symlinks, the .git dir symlink trick cannot be used. Since we're going to be in direct mode anyway, the .git dir symlink is not strictly needed. However, I have not fixed the code that creates new annex symlinks to handle this case -- the committed symlinks will be wrong. git annex sync happens to currently fail in a submodule using direct mode, because there's no HEAD ref. That also needs to be dealt with to get this fully working in crippled filesystems. Leaving http://github.com/datalad/datalad/issues/44 open until these issues are dealt with.
* | add -q to git symbolic-ref callGravatar Joey Hess2015-03-02
| | | | | | | | | | | | | | | | | | | | | | Avoids a warning message from git when HEAD doesn't exist. Which it won't when eg, git-annex is used in a submodule just cloned with git clone --recursive. In this case, a specific ref is checked out and there's no HEAD yet. The code already returned Nothing in this case, so no behavior change other than not showing the warning. And git-annex operates fine in this situation.
| * (no commit message)Gravatar https://www.google.com/accounts/o8/id?id=AItOawlc-3pdibcizrdz4WmZooECL0k6AvM1cWc2015-03-02
| |
| * poll vote (OpenStack SWIFT)Gravatar 195.187.238.802015-03-02
| |
| * poll vote (OpenStack SWIFT)Gravatar 195.187.238.802015-03-02
| |