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

10597 commits

This branch
This branch
All branches
Author SHA1 Message Date
Joey Hess
e363cefcb3 assistant: Fix bug that could cause incoming pushes to not get merged into the local tree. 
Observed that the pushed refs were received, but not merged into master.
The merger never saw an add event for these refs. Either git is not writing
to a new file and renaming it into place, or the inotify code didn't notice
that. Changed it to also watch for modify events and that seems to have
fixed it!
 2013-04-30 16:37:13 -04:00
https://www.google.com/accounts/o8/id?id=AItOawmp1ThsNNAbSn46ju-gwFELfStlhl8usJo
756a90d917 Added a comment: Another correction 2013-04-30 20:11:58 +00:00
Joey Hess
bcb23eca4b update changelog 
Note that the note on df88c51334 turned out
to be wrong. Multiple repository pairing over XMPP does work, because the
annex-uuid of the xmpp remote is updated to the uuid of the new repo
when pairing takes place. So the push from it is accepted. (And the other
UUIDs are listed in uuid.log, so pushes from those repositories also are
accepted of course.)
 2013-04-30 16:01:25 -04:00
Joey Hess
e06a4e12b5 more xmpp debugging 2013-04-30 15:56:33 -04:00
https://www.google.com/accounts/o8/id?id=AItOawmp1ThsNNAbSn46ju-gwFELfStlhl8usJo
ce3968ae6e Added a comment: I should have thought of this 2013-04-30 19:55:19 +00:00
Joey Hess
017f62654f stop using UltDest, doesn't seem to reliably work 2013-04-30 15:21:49 -04:00
Joey Hess
9249c324f4 Merge branch 'master' of ssh://git-annex.branchable.com 2013-04-30 14:14:56 -04:00
Joey Hess
543a78bae0 Support building with DAV 0.4. 2013-04-30 14:10:55 -04:00
Joey Hess
df88c51334 add uuid to all xmpp messages 
(Except for the actual streaming of receive-pack through XMPP, which
can only run once we've gotten an appropriate uuid in a push initiation
message.)

Pushes are now only initiated when the initiation message comes from a
known uuid. This allows multiple distinct repositories to use the same xmpp
address.

Note: This probably breaks initial push after xmpp pairing, because at that
point we may not know about the paired uuid, and so reject the push from
it. It won't break in simple cases, because the annex-uuid of the remote
is checked. However, when there are multiple clients behind a single xmpp
address, only uuid of the first is recorded in annex-uuid, and so any
pushes from the others will be rejected (unless the first remote pushes their
uuids to us beforehand.
 2013-04-30 13:22:55 -04:00
92.29.247.30
1f95207388 poll vote (/sdcard/annex) 2013-04-30 06:55:10 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmRFKwny4rArBaz-36xTcsJYqKIgdDaw5Q
197467927c Added a comment 2013-04-30 02:31:32 +00:00
https://launchpad.net/~maestro-alubia
167e184b00 Added a comment 2013-04-29 21:04:30 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkCw26IdxXXPBoLcZsQFslM67OJSJynb1w
cb5c7e47b7 Added a comment: standalone app dmg won't open in OSX 10.8.3 2013-04-29 18:05:54 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkCw26IdxXXPBoLcZsQFslM67OJSJynb1w
9139f5299b Added a comment: can't install git-annex on OS X Mountain Lion without disabling WebDAV support 2013-04-29 17:57:03 +00:00
http://identi.ca/cwebber/
6c11a13d77 2013-04-29 01:46:23 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnLgNOfkl8c6oQu9b42U0Pm_uC4n3Gkgiw
b115839212 Added a comment: Thanks! 2013-04-29 01:24:56 +00:00
fmarier
67fc51d24e Add homepage and convert a few links to HTTPS 2013-04-28 22:17:45 +00:00
fmarier
da238f6fc6 Added a comment: My current XMPP setup 2013-04-28 22:16:51 +00:00
http://edheil.wordpress.com/
8d07fafaa8 Added a comment 2013-04-28 18:12:30 +00:00
Joey Hess
343f989c14 close 2013-04-28 13:31:13 -04:00
http://edheil.wordpress.com/
57203fed7a Added a comment 2013-04-28 17:01:29 +00:00
http://edheil.wordpress.com/
42e90d1124 Added a comment 2013-04-28 05:59:54 +00:00
fmarier
f6d75ab965 Added a comment: My PPA (Ubuntu Precise) has git-annex 4.20130417 2013-04-27 23:31:54 +00:00
http://joeyh.name/
5163fba922 Added a comment 2013-04-27 21:56:24 +00:00
Richard Hartmann
31475cf36e Typo 2013-04-27 23:47:40 +02:00
http://edheil.wordpress.com/
4c6d26bac4 Added a comment 2013-04-27 21:44:19 +00:00
http://joeyh.name/
9a58188876 removed 2013-04-27 21:26:47 +00:00
http://joeyh.name/
855aec825b Added a comment 2013-04-27 21:26:11 +00:00
http://joeyh.name/
1658fcbccb Added a comment 2013-04-27 21:13:23 +00:00
Joey Hess
02e4bb0da9 Merge branch 'master' of ssh://git-annex.branchable.com 2013-04-27 17:07:47 -04:00
Joey Hess
abd85d9f3d blog for the day 2013-04-27 17:05:27 -04:00
Joey Hess
883b17af01 Store an annex-uuid file in the bucket when setting up a new S3 remote. 2013-04-27 17:01:24 -04:00
http://edheil.wordpress.com/
b324492929 Added a comment 2013-04-27 20:51:03 +00:00
Joey Hess
bda4a6c56f Merge branch 'master' of ssh://git-annex.branchable.com 2013-04-27 15:56:47 -04:00
http://joeyh.name/
f967e34f5f Added a comment 2013-04-27 19:54:42 +00:00
http://joeyh.name/
d6e2f44bee Added a comment 2013-04-27 19:35:15 +00:00
Joey Hess
503be0c53e there are multiple free options now, de-emphasize "free" 2013-04-27 15:19:27 -04:00
Joey Hess
c3498042fd webapp: Now automatically fills in any creds used by an existing remote when creating a new remote of the same type. Done for Internet Archive, S3, Glacier, and Box.com remotes. 2013-04-27 15:16:06 -04:00
http://joeyh.name/
165fb8c571 removed 2013-04-27 17:25:19 +00:00
https://pradermecker.myopenid.com/
1a4ea6fb7b Added a comment 2013-04-27 17:14:43 +00:00
Joey Hess
8626e67e97 update 2013-04-27 13:00:57 -04:00
Joey Hess
cfaee41cf4 add 2013-04-27 12:43:58 -04:00
Joey Hess
767084af54 Merge branch 'master' of ssh://git-annex.branchable.com 2013-04-27 11:22:30 -04:00
Joey Hess
8bf07b530f update 2013-04-27 11:21:58 -04:00
Joey Hess
4d5d8c2f85 update, add fmarier PPA 2013-04-27 11:21:48 -04:00
fmarier
60f4bb9509 Added a comment: My PPA (Ubuntu Precise) has git-annex 4.20130417 2013-04-27 11:12:27 +00:00
http://edheil.wordpress.com/
d97bb05856 Added a comment 2013-04-27 05:45:54 +00:00
http://joeyh.name/
63e0af2252 Added a comment 2013-04-26 22:25:04 +00:00
Joey Hess
5326d25205 Merge branch 'master' of ssh://git-annex.branchable.com 2013-04-26 18:23:34 -04:00
Joey Hess
acf8b257ba blog for the day 2013-04-26 18:23:06 -04:00