Commit graph

15540 commits

Author SHA1 Message Date
https://www.google.com/accounts/o8/id?id=AItOawnZEanlyzay_QlEAL0CWpyZcRTyN7vay8U
755a152979 2013-11-16 08:36:21 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmZgZuUhZlHpd_AbbcixY0QQiutb2I7GWY
0d6f3ca312 rename bugs/Mac_OS_10.9_GPG_erro_when_creating_USB_repo.mdwn to bugs/Mac_OS_10.9_GPG_erro_when_creating_USB_repo___40__solved__41__.mdwn 2013-11-15 23:12:11 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmZgZuUhZlHpd_AbbcixY0QQiutb2I7GWY
65e6e69868 rename bugs/Mac_OS_10.9_GPG_error_adding_S3_repo.mdwn to bugs/Mac_OS_10.9_GPG_error_adding_S3_repo___40__solved__41__.mdwn 2013-11-15 23:10:57 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmZgZuUhZlHpd_AbbcixY0QQiutb2I7GWY
5b72b3e5ea Added a comment 2013-11-15 21:31:40 +00:00
Joey Hess
3731e13128 Merge branch 'master' of ssh://git-annex.branchable.com 2013-11-15 17:06:12 -04:00
Joey Hess
7323770d8a run each quickcheck test 1000, rather than 100 times
I've had one or two fails sent to me involving cases QuickCheck didh't
easily find, and tasty makes this easy.
2013-11-15 17:04:40 -04:00
https://www.google.com/accounts/o8/id?id=AItOawkSq2FDpK2n66QRUxtqqdbyDuwgbQmUWus
1158b8f20e Added a comment 2013-11-15 20:57:28 +00:00
http://joeyh.name/
e442571612 Added a comment 2013-11-15 20:53:17 +00:00
http://joeyh.name/
24d30acdc4 Added a comment 2013-11-15 20:51:18 +00:00
Joey Hess
3eeb721a90 combine bugs 2013-11-15 16:42:20 -04:00
http://joeyh.name/
6f06f8c103 Added a comment 2013-11-15 20:39:43 +00:00
http://joeyh.name/
d89faeff61 Added a comment 2013-11-15 20:33:47 +00:00
Joey Hess
749e92a199 Merge branch 'master' of ssh://git-annex.branchable.com 2013-11-15 16:31:36 -04:00
Joey Hess
a86c69aa39 add 2013-11-15 16:30:56 -04:00
Joey Hess
493a989d06 Switched to the tasty test framework. 2013-11-15 16:02:12 -04:00
Joey Hess
27179ad6fc Merge branch 'master' into tasty-tests 2013-11-15 15:42:58 -04:00
Joey Hess
27fb2b6126 add test case for b0f85b3e22 2013-11-15 15:42:31 -04:00
http://joeyh.name/
f23d6b5290 Added a comment 2013-11-15 19:00:25 +00:00
https://www.google.com/accounts/o8/id?id=AItOawk_Di-Ww6ffK-SCHQmIewEO_CdNjVXX17E
d47abf7c9f fix typo 2013-11-15 18:57:29 +00:00
Joey Hess
27bbdb1fe1 Merge branch 'master' of ssh://git-annex.branchable.com 2013-11-15 14:53:50 -04:00
Joey Hess
c20f3c3cba update 2013-11-15 14:52:39 -04:00
Joey Hess
d48b00ebed Direct mode .git/annex/objects directories are no longer left writable
Because that allowed writing to symlinks of files that are not present,
which followed the link and put bad content in an object location.

fsck: Fix up .git/annex/object directory permissions.

This commit was sponsored by an anonymous bitcoin donor.
2013-11-15 14:52:03 -04:00
http://joeyh.name/
4515fae064 Added a comment 2013-11-15 17:52:38 +00:00
http://joeyh.name/
1a69bf2db7 Added a comment 2013-11-15 17:48:43 +00:00
Joey Hess
b0f85b3e22 Fix direct mode merge bug when a direct mode file was deleted and replaced with a directory. An ordering problem caused the directory to not get created in this case. Thanks to Tim for the test cases. 2013-11-15 13:40:12 -04:00
http://joeyh.name/
bba43310c0 Added a comment 2013-11-15 17:39:39 +00:00
Joey Hess
0744560e4b Merge branch 'master' of ssh://git-annex.branchable.com 2013-11-15 12:31:05 -04:00
Joey Hess
9fde0c561a mac builds 2013-11-15 12:30:24 -04:00
gueux
36e41c7625 2013-11-15 15:12:28 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmkXtBdMgE1d9nCz2iBc4f85xh4izZ_auU
b68daf2a2b Added a comment: So what does "git annex drop" do in direct mode? 2013-11-15 15:07:57 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnZEanlyzay_QlEAL0CWpyZcRTyN7vay8U
7a018b1c21 Added a comment 2013-11-15 13:43:06 +00:00
gueux
55282738bb rename todo/Check_if_an_upgrade_is_available_in_webapp.mdwn to todo/Check_if_an_upgrade_is_available_in_the_webapp.mdwn 2013-11-15 13:29:32 +00:00
gueux
742343b696 2013-11-15 13:28:07 +00:00
https://www.google.com/accounts/o8/id?id=AItOawn1QhtPvsRBV7pfaDW_ZTPFv_ZIxSzQ8Rg
645ee3ee30 2013-11-15 06:46:16 +00:00
Joey Hess
238fa05545 tasty fully working 2013-11-14 20:09:47 -04:00
Joey Hess
f7cbc92093 Merge branch 'master' of ssh://git-annex.branchable.com 2013-11-14 18:15:40 -04:00
Joey Hess
ed95584778 devblog 2013-11-14 18:15:03 -04:00
http://joeyh.name/
edfeb55bbe Added a comment 2013-11-14 22:10:33 +00:00
Joey Hess
2755c7f558 Merge branch 'master' into tasty-tests
Conflicts:
	Test.hs
2013-11-14 17:04:58 -04:00
Joey Hess
cf93636df8 finished converting test suite for tasty
Also merged in Test.hs from master.
2013-11-14 17:03:49 -04:00
https://www.google.com/accounts/o8/id?id=AItOawmkXtBdMgE1d9nCz2iBc4f85xh4izZ_auU
c32bb3e93d Added a comment: Easy to fix. 2013-11-14 20:36:18 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmkXtBdMgE1d9nCz2iBc4f85xh4izZ_auU
5e86f0b273 added a gpg bug 2013-11-14 20:30:51 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnmF_9CAtfqdZkC4e-_dCX-rK5bqh4RWkw
75f63d3bf6 Added a comment 2013-11-14 19:22:16 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmkXtBdMgE1d9nCz2iBc4f85xh4izZ_auU
bf9afe9972 Added a comment: Using a portable drive as another transfer device? – cool. 2013-11-14 19:05:56 +00:00
http://joeyh.name/
a3fc60f524 Added a comment 2013-11-14 18:55:55 +00:00
Joey Hess
0f40a80f97 update test suite for status -> info rename 2013-11-14 14:42:18 -04:00
Joey Hess
cb02104fea fix 2013-11-14 14:38:23 -04:00
Joey Hess
48dc72781f format 2013-11-14 14:38:08 -04:00
Joey Hess
2a297dd6d1 on second thought, don't change sync to exit nonzero on successful conflicted merge resolution
For one thing, that breaks the test suite. May revisit later.
2013-11-14 14:36:48 -04:00
Joey Hess
ac000241b5 Merge branch 'master' of ssh://git-annex.branchable.com 2013-11-14 14:29:57 -04:00