mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions
19617 commits 13 branches 445 tags 110 MiB
Commit graph

4737 commits

Author SHA1 Message Date
Joey Hess
37e8945827 Merge branch 'master' of ssh://git-annex.branchable.com 2014-05-29 13:19:56 -04:00
Joey Hess
973166c2cb close 2014-05-29 13:19:07 -04:00
https://www.google.com/accounts/o8/id?id=AItOawmqz6wCn-Q1vzrsHGvEJHOt_T5ZESilxhc
818c797d0e Added a comment 2014-05-29 16:48:18 +00:00
https://id.koumbit.net/anarcat
793b39360b Added a comment 2014-05-29 16:09:38 +00:00
Balan
badc9a4c75 Added a comment: http://freshofruits.com 2014-05-29 07:25:15 +00:00
Balan
fcc79f9bb2 Added a comment: Buy Fruits Online | Fruits Online Chennai 2014-05-29 07:23:20 +00:00
http://joeyh.name/
92a05910e9 Added a comment 2014-05-28 22:31:21 +00:00
http://joeyh.name/
d0ab472718 Added a comment 2014-05-28 22:29:05 +00:00
Joey Hess
0736b265da confirmed 2014-05-28 18:27:15 -04:00
bnikolic
30398456a0 2014-05-28 21:25:57 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmqz6wCn-Q1vzrsHGvEJHOt_T5ZESilxhc
6e040807dd Added a comment 2014-05-28 17:30:43 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmqz6wCn-Q1vzrsHGvEJHOt_T5ZESilxhc
f3652880d1 Added a comment 2014-05-28 15:03:26 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmi0jblSiI4c5-EswqKw4PXkx5M4fuVvdk
df8388e9aa 2014-05-28 14:50:37 +00:00
EskildHustvedt
e1b5de522e 2014-05-28 09:26:48 +00:00
http://joeyh.name/
d78c187c72 Added a comment 2014-05-28 00:37:30 +00:00
http://joeyh.name/
723c4f3edc Added a comment 2014-05-28 00:33:48 +00:00
http://joeyh.name/
6bf824eb4c Added a comment 2014-05-28 00:04:58 +00:00
http://joeyh.name/
75b19afb8c Added a comment 2014-05-28 00:02:43 +00:00
http://joeyh.name/
fd38145408 Added a comment 2014-05-27 20:23:04 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmqz6wCn-Q1vzrsHGvEJHOt_T5ZESilxhc
457b3bf4fd Added a comment 2014-05-27 19:58:37 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmZilYULa6CDEGfuagoDlesyakBgnf-dF8
0f6079f33e Added a comment 2014-05-27 19:07:45 +00:00
http://joeyh.name/
3d9bd11ac6 Added a comment 2014-05-27 19:03:20 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmZilYULa6CDEGfuagoDlesyakBgnf-dF8
c0fadd2229 Added a comment 2014-05-27 18:59:08 +00:00
http://joeyh.name/
91f48d8da2 Added a comment 2014-05-27 18:45:35 +00:00
Joey Hess
a41ddabd73 webapp: When setting up a ssh remote, if the user inputs ~/foo, normalize that to foo, since it's in the home directory by default. 2014-05-27 14:33:27 -04:00
Joey Hess
dd5ac19b39 Merge branch 'master' of ssh://git-annex.branchable.com 2014-05-27 14:16:55 -04:00
Joey Hess
95ca3bb022 Fix encoding of data written to git-annex branch. Avoid truncating unicode characters to 8 bits. 
Allow any encoding to be used, as with filenames (but utf8 is the sane
choice). Affects metadata and repository descriptions, and preferred
content expressions.

The question of what's the right encoding for the git-annex branch is a
vexing one. utf-8 would be a nice choice, but this leaves the possibility
of bad data getting into a git-annex branch somehow, and this resulting in
git-annex crashing with encoding errors, which is a failure mode I want to
avoid.

(Also, preferred content expressions can refer to filenames, and filenames
can have any encoding, so limiting to utf-8 would not be ideal.)

The union merge code already took care to not assume any encoding for a
file. Except it assumes that any \n is a literal newline, and not part of
some encoding of a character that happens to contain a newline. (At least
utf-8 avoids using newline for anything except liternal newlines.)
Adapted the git-annex branch code to use this same approach.

Note that there is a potential interop problem with Windows, since
FileSystemEncoding doesn't work there, and instead things are always
decoded as utf-8. If someone uses non-utf8 encoding for data on the
git-annex branch, this can lead to an encoding error on windows. However,
this commit doesn't actually make that any worse, because the union merge
code would similarly fail with an encoding error on windows in that
situation.

This commit was sponsored by Kyle Meyer.
 2014-05-27 14:16:33 -04:00
http://joeyh.name/
b7a788b62b Added a comment 2014-05-27 18:02:11 +00:00
http://joeyh.name/
df1e38d7af Added a comment 2014-05-27 17:58:35 +00:00
http://joeyh.name/
4cab8f0262 Added a comment 2014-05-27 17:54:06 +00:00
Joey Hess
2dc0c434e0 Merge branch 'master' of ssh://git-annex.branchable.com 2014-05-27 12:58:08 -04:00
http://joeyh.name/
293f722fb4 Added a comment 2014-05-27 16:13:09 +00:00
Joey Hess
52386a7cdf
pebak 2014-05-27 12:00:40 -04:00
https://id.koumbit.net/anarcat
4b4e4ef328 Added a comment 2014-05-27 03:00:48 +00:00
http://svario.it/gioele
5deb81648b New bug "import" generates a commit even with autocommit=false 2014-05-26 16:13:38 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkYmMFDdf3GJ9Oba6NCVkzGc4JyB9WavMs
7ff3e8a793 2014-05-26 14:55:25 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmZilYULa6CDEGfuagoDlesyakBgnf-dF8
a37e276df6 removed 2014-05-26 11:52:53 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmZilYULa6CDEGfuagoDlesyakBgnf-dF8
2b89dd9ce6 Added a comment 2014-05-26 11:52:27 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmZilYULa6CDEGfuagoDlesyakBgnf-dF8
5992244977 Added a comment 2014-05-26 11:52:19 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmZilYULa6CDEGfuagoDlesyakBgnf-dF8
98a4eea9c6 2014-05-25 22:14:20 +00:00
https://www.google.com/accounts/o8/id?id=AItOawlu-fdXIt_RF9ggvg4zP0yBbtjWQwHAMS4
fc149e21fc 2014-05-25 19:50:42 +00:00
https://www.google.com/accounts/o8/id?id=AItOawlu-fdXIt_RF9ggvg4zP0yBbtjWQwHAMS4
2fdc9b4cc0 2014-05-25 19:47:49 +00:00
https://me.yahoo.com/a/FHnTlSBo1eCGJRwueeKeB6.RCaPbGMPr5jxx8A--#ce0d8
a9091cac2e Added a comment 2014-05-25 15:16:33 +00:00
https://www.google.com/accounts/o8/id?id=AItOawke2Zlikj8zQb7M2IWyqT3rqN5mOi-uVrk
2815f5cfb4 2014-05-25 13:13:08 +00:00
https://www.google.com/accounts/o8/id?id=AItOawln3ckqKx0x_xDZMYwa9Q1bn4I06oWjkog
6e12be8b29 Added a comment 2014-05-24 22:58:16 +00:00
https://www.google.com/accounts/o8/id?id=AItOawln3ckqKx0x_xDZMYwa9Q1bn4I06oWjkog
2c0b99d1a9 Added a comment 2014-05-24 22:07:15 +00:00
https://www.google.com/accounts/o8/id?id=AItOawln3ckqKx0x_xDZMYwa9Q1bn4I06oWjkog
2cda8da4b6 removed 2014-05-24 22:04:48 +00:00
https://www.google.com/accounts/o8/id?id=AItOawln3ckqKx0x_xDZMYwa9Q1bn4I06oWjkog
7d2c33d3d9 removed 2014-05-24 22:03:00 +00:00
https://www.google.com/accounts/o8/id?id=AItOawln3ckqKx0x_xDZMYwa9Q1bn4I06oWjkog
826f0562de Added a comment 2014-05-24 22:01:05 +00:00
https://www.google.com/accounts/o8/id?id=AItOawln3ckqKx0x_xDZMYwa9Q1bn4I06oWjkog
5ce3ba2ca0 Added a comment 2014-05-24 21:55:54 +00:00