Commit graph

23928 commits

Author SHA1 Message Date
Joey Hess
04fea57a5c Merge branch 'master' of ssh://git-annex.branchable.com 2015-04-20 14:11:00 -04:00
Joey Hess
5948c148fb Make repo init more robust.
The setDifferences that got added to initialize turns out to make a git
commit, and before ensureCommit has been used. Thus, repo init can fail
when the system has a broken hostname etc.

Move the ensureCommit to the very first thing to avoid this kind of breakage.
2015-04-20 14:01:41 -04:00
http://joeyh.name/
e3ccc06753 Added a comment 2015-04-20 17:43:48 +00:00
https://www.google.com/accounts/o8/id?id=AItOawlh1G1u_AMJEyADqlfuzV2cePniocDyK6A
6de4079047 Added a comment 2015-04-20 17:43:11 +00:00
https://www.google.com/accounts/o8/id?id=AItOawlh1G1u_AMJEyADqlfuzV2cePniocDyK6A
1ba092080c Added a comment 2015-04-20 17:40:38 +00:00
Joey Hess
fdf0d708d2 reorder 2015-04-20 13:35:09 -04:00
Joey Hess
911335247c if ~/.ssh does not exist and cannot be created, avoid failing 2015-04-20 13:15:01 -04:00
Joey Hess
10afac3fba another lib 2015-04-20 13:03:46 -04:00
Joey Hess
ed10722fae another lib 2015-04-20 12:20:42 -04:00
Joey Hess
9f4647e091 updated lib version 2015-04-20 12:09:55 -04:00
Joey Hess
7c17ad05d2 more libs 2015-04-20 12:01:26 -04:00
Joey Hess
0bc67213cc more libs 2015-04-20 11:47:58 -04:00
Joey Hess
2387c6f5c6 unused import on windows 2015-04-20 11:27:47 -04:00
Joey Hess
b1cb603b6b more libs 2015-04-20 11:25:40 -04:00
Joey Hess
c1859130c2 prune old lib 2015-04-20 11:12:59 -04:00
Joey Hess
1ca7fd481b Merge branch 'master' of ssh://git-annex.branchable.com 2015-04-20 11:08:54 -04:00
Joey Hess
2665be44d5 update some windows libraries for newer version of cygwin 2015-04-20 11:08:32 -04:00
https://www.google.com/accounts/o8/id?id=AItOawl9sYlePmv1xK-VvjBdN-5doOa_Xw-jH4U
ace24739ac 2015-04-20 14:41:27 +00:00
https://www.google.com/accounts/o8/id?id=AItOawl9sYlePmv1xK-VvjBdN-5doOa_Xw-jH4U
957ac64361 removed 2015-04-20 14:37:46 +00:00
https://www.google.com/accounts/o8/id?id=AItOawl9sYlePmv1xK-VvjBdN-5doOa_Xw-jH4U
7eaf015a66 Added a comment 2015-04-20 14:37:10 +00:00
https://www.google.com/accounts/o8/id?id=AItOawl9sYlePmv1xK-VvjBdN-5doOa_Xw-jH4U
de3d2d5295 Added a comment 2015-04-20 14:37:03 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnSenxKyE_2Z6Wb-EBMO8FciyRywjx1ZiQ
900e1b676c 2015-04-19 22:25:03 +00:00
CandyAngel
6ed1e1e2bf Added a comment 2015-04-19 15:51:45 +00:00
Joey Hess
eecbad98e1 Merge branch 'master' of ssh://git-annex.branchable.com 2015-04-19 11:45:13 -04:00
Joey Hess
5f73bc3a12 Removed dependency on haskell SHA library, instead using cryptohash >= 0.11.0. 2015-04-19 11:05:32 -04:00
Joey Hess
be3895be45 refactor 2015-04-19 10:57:14 -04:00
Joey Hess
c0497aa571 switch to using cryptohash for MAC 2015-04-19 10:54:12 -04:00
Joey Hess
d3cff7a320 add test for stable macs 2015-04-19 10:52:49 -04:00
Joey Hess
ca2cf63e34 clean up imports 2015-04-19 10:47:07 -04:00
https://www.google.com/accounts/o8/id?id=AItOawkR8WOH6nas8O1_HG0w8AMmq7owXZQHYJw
6f932205fb 2015-04-19 14:07:31 +00:00
http://hendry.iki.fi/
fc41977f90 Added a comment: git annex unused doesn't help 2015-04-19 13:24:51 +00:00
Joey Hess
c3dd133257 desc 2015-04-19 08:18:17 -04:00
Joey Hess
addc82dab7 removed all uses of undefined from code base
It's a code smell, can lead to hard to diagnose error messages.
2015-04-19 00:38:29 -04:00
Joey Hess
d7f4c823d7 devblog 2015-04-18 16:15:06 -04:00
Joey Hess
978906c616 forgot to add these 2015-04-18 16:09:09 -04:00
Joey Hess
22c445f3eb response 2015-04-18 16:07:02 -04:00
Joey Hess
ef2202fd94 required: New command, like wanted, but for required content.
Also refactored some code to reduce duplication.
2015-04-18 16:04:35 -04:00
Joey Hess
c3732bddda comment 2015-04-18 15:30:36 -04:00
Joey Hess
9c5c39cf54 comment 2015-04-18 15:24:25 -04:00
Joey Hess
460e04ce9e cmment 2015-04-18 15:17:59 -04:00
Joey Hess
d4b87e482a comment 2015-04-18 15:11:37 -04:00
Joey Hess
c41bc24198 try to encourage use of that paste feature that some OS's have 2015-04-18 14:55:00 -04:00
Joey Hess
b89866f8ca probably peback 2015-04-18 14:46:28 -04:00
Joey Hess
8d685768d3 fsck --from remote: Avoid downloading a key if it would go over the annex.diskreserve limit. 2015-04-18 14:23:42 -04:00
Joey Hess
8489057e8d fsck --from remote: When bad content is found in the remote, and the local repo does not have a copy of the content, preserve the bad content in .git/annex/bad/ to avoid further data loss. 2015-04-18 14:13:07 -04:00
Joey Hess
0def1f0b53 Fix fsck --from a git remote in a local directory, and from a directory special remote. This was a reversion caused by the relative path changes in 5.20150113.
The directory special remote was not affected in its normal configuration,
since annex-directory is an absolute path normally. But it could fail
when a relative path was used.

The git remote was affected even when an absolute path to it was used in
.git/config, since git-annex now converts all such paths to relative.
2015-04-18 13:36:12 -04:00
Joey Hess
3bf3642149 Merge branch 'master' of ssh://git-annex.branchable.com 2015-04-18 13:14:11 -04:00
Joey Hess
234830b5c9 comment 2015-04-18 13:07:57 -04:00
CandyAngel
66806fa527 2015-04-18 16:55:50 +00:00
Joey Hess
cfe20dd788 update pinned versions for android and armel to use new enough http-client for proxy support
I have not updated the autobuilder yet; these versions seem ok by
inspection.
2015-04-18 12:44:44 -04:00