mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
15368 commits 13 branches 442 tags 103 MiB
Commit graph

15368 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
Joey Hess
4c5850a17f mavericks 2013-11-14 14:18:29 -04:00
Joey Hess
2d0a05c0fe add a note after successful conflicted merge resolution 2013-11-14 14:18:15 -04:00
https://www.google.com/accounts/o8/id?id=AItOawlWskoNgUB7r70OXglR-4iKI4bOuPJb-xg
e0fd95d0af Added a comment 2013-11-14 18:06:55 +00:00
https://www.google.com/accounts/o8/id?id=AItOawlHNJ7FpiXJNwSmojlwKwXhhF5QvwpNPmI
de6c04fc9e Added a comment: Confirmed 2013-11-14 17:57:23 +00:00
Joey Hess
b0f7c80378 Merge branch 'master' of ssh://git-annex.branchable.com 2013-11-14 13:50:19 -04:00
Joey Hess
69d68f9d53 work around OSX mavericks' broken cpp 2013-11-14 13:49:11 -04:00
http://joeyh.name/
335eeb6f9a Added a comment 2013-11-14 17:10:55 +00:00
http://joeyh.name/
920cdb68e2 Added a comment 2013-11-14 17:06:52 +00:00
Joey Hess
82dcf33482 Merge branch 'master' of ssh://git-annex.branchable.com 2013-11-14 12:46:50 -04:00
https://www.google.com/accounts/o8/id?id=AItOawlWskoNgUB7r70OXglR-4iKI4bOuPJb-xg
a5630e988b 2013-11-14 16:21:12 +00:00
https://www.google.com/accounts/o8/id?id=AItOawlWskoNgUB7r70OXglR-4iKI4bOuPJb-xg
2a4a72cbf8 2013-11-14 16:20:51 +00:00
https://www.google.com/accounts/o8/id?id=AItOawlWskoNgUB7r70OXglR-4iKI4bOuPJb-xg
223c37feef 2013-11-14 16:20:05 +00:00
https://www.google.com/accounts/o8/id?id=AItOawlWskoNgUB7r70OXglR-4iKI4bOuPJb-xg
467d576560 2013-11-14 16:18:42 +00:00
https://www.google.com/accounts/o8/id?id=AItOawlWskoNgUB7r70OXglR-4iKI4bOuPJb-xg
ba8031a314 2013-11-14 15:26:19 +00:00
http://joeyh.name/
e3bf069e41 Added a comment 2013-11-14 15:26:01 +00:00
https://www.google.com/accounts/o8/id?id=AItOawlWskoNgUB7r70OXglR-4iKI4bOuPJb-xg
b6659be44b 2013-11-14 15:25:24 +00:00
https://www.google.com/accounts/o8/id?id=AItOawlWskoNgUB7r70OXglR-4iKI4bOuPJb-xg
8c3c7799ba Added a comment 2013-11-14 14:58:11 +00:00
http://id.clacke.se/
c0501bb4be Added a comment 2013-11-14 10:00:20 +00:00
gueux
9023037e70 2013-11-14 09:19:36 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmbo-yMzW_lkBrS4ICNn5XMr8saYtI1_WY
981544217c Added a comment: Any further info regarding gitolite support? 2013-11-14 03:20:32 +00:00
Joey Hess
6049119628 copied a very interesting comment from the poll site 2013-11-13 20:59:17 -04:00