Commit graph

18878 commits

Author SHA1 Message Date
Joey Hess
4887f8f860 this keyring contains keys that git-annex should trust to sign upgrades
Currently, that is the git-annex distribution signing key, 89C809CB

I have also included my personal gpg key, 2512E3C7. This is in case
something goes wrong with the other key (perhaps it gets lost), we'll
hopefully avoid locking everything out of upgradng.
2014-04-23 12:49:09 -04:00
Joey Hess
dc0a8b7618 Revert "add debugging for odd OOM or hang on 5 architectures, all where configure runs sha224sum"
This reverts commit 238a935f9c.

The OOM was cabal's way of telling us it couldn't resolve dependencies.
2014-04-22 20:23:37 -04:00
Joey Hess
c0b6022b25 Merge branch 'master' of ssh://git-annex.branchable.com 2014-04-21 17:23:09 -04:00
Joey Hess
9ad12e9e88
devblog 2014-04-21 17:22:17 -04:00
Joey Hess
7261fac77e update 2014-04-21 17:18:40 -04:00
https://www.google.com/accounts/o8/id?id=AItOawmhufs6QGCQXnUEc6qrCcQIZTomUDKNeAQ
f5d3667601 Added a comment: Git annex in a strange direct with .git/annex/objects mode 2014-04-21 21:03:25 +00:00
Joey Hess
1cd169e0c8
--detach-sign 2014-04-21 11:56:06 -04:00
Joey Hess
7761f917da add news item for git-annex 5.20140421 2014-04-21 11:50:45 -04:00
Joey Hess
0bd7e94005 Merge remote-tracking branch 'refs/remotes/dgit/dgit/sid' 2014-04-21 11:49:23 -04:00
Joey Hess
78d6aa1a49 sign files 2014-04-21 11:24:34 -04:00
Joey Hess
515d251127
better approach for building distributionupdate
Use cabal include file
2014-04-21 10:57:01 -04:00
Joey Hess
a10d3731b8 fix distributionupdate build
Including avoiding needing cabal's defines for Utility.URI
2014-04-21 10:47:26 -04:00
https://www.google.com/accounts/o8/id?id=AItOawmsz4weoPXV2oEtv3zpo9dOxn_SEPz-7Iw
bdbc25ed14 Added a comment: more notes about Tahoe-LAFS performance 2014-04-21 07:18:06 +00:00
Joey Hess
78e08d1d46 Merge branch 'master' of ssh://git-annex.branchable.com 2014-04-21 00:38:01 -04:00
Joey Hess
291847bf88
allow building with old feed lib, w/o pubdate 2014-04-21 00:37:14 -04:00
https://id.koumbit.net/anarcat
a25b8bb40e Added a comment 2014-04-20 23:58:51 +00:00
https://id.koumbit.net/anarcat
01ff668b8b Added a comment 2014-04-20 23:58:00 +00:00
Joey Hess
238a935f9c add debugging for odd OOM or hang on 5 architectures, all where configure runs sha224sum 2014-04-20 19:55:08 -04:00
Joey Hess
6fbf4ab776 prep release 2014-04-20 19:46:01 -04:00
Joey Hess
e8c45e9abb
devblog 2014-04-20 18:51:49 -04:00
Joey Hess
78434471e8 Merge branch 'master' of ssh://git-annex.branchable.com 2014-04-20 18:44:10 -04:00
Joey Hess
eba3a28a28 webapp: Support using git-annex on a remote server, which was installed from the standalone tarball or OSX app, and so does not have git-annex in PATH (and may also not have git or rsync in PATH).
* webapp: Support using git-annex on a remote server, which was installed
  from the standalone tarball or OSX app, and so does not have
  git-annex in PATH (and may also not have git or rsync in PATH).
* standalone tarball, OSX app: Install a ~/.ssh/git-annex-wrapper, which
  can be used to run git-annex, git, rsync, etc.
2014-04-20 18:39:10 -04:00
http://joeyh.name/
3fd08f8ac3 Added a comment 2014-04-20 21:01:50 +00:00
Joey Hess
b98e0420fc dup 2014-04-20 16:59:57 -04:00
http://joeyh.name/
317893f3fb Added a comment 2014-04-20 20:59:35 +00:00
http://joeyh.name/
d56b0c6a0a Added a comment 2014-04-20 20:58:22 +00:00
Joey Hess
5406a4bcc6 Merge branch 'master' of ssh://git-annex.branchable.com 2014-04-20 16:57:12 -04:00
Joey Hess
2807e14904
use a subdir of GIT_ANNEX_TMP for ssh connection caching sockets
To prevent any possible collisions with other, non-socket files, like the
xmppgit directory.
2014-04-20 16:56:01 -04:00
cbaines
45edc6b6e9 Added a comment 2014-04-20 20:21:05 +00:00
http://joeyh.name/
c21e8d4710 Added a comment 2014-04-20 19:55:59 +00:00
cbaines
bd709d3a9e Added a comment 2014-04-20 19:50:12 +00:00
Joey Hess
dbe1f40f94 Merge branch 'master' of ssh://git-annex.branchable.com 2014-04-20 15:47:34 -04:00
Joey Hess
f3261ce525 fix RELOAD 2014-04-20 15:45:14 -04:00
cbaines
cff62a33f8 Added a comment 2014-04-20 19:40:11 +00:00
Joey Hess
512da29273 send remote-daemon a RELOAD after making a ssh remote
This doesn't work yet, because RELOAD is buggy and does not notice the new
remote.
2014-04-20 15:30:39 -04:00
Joey Hess
1a4c3caa96 avoid showing the connection nudge alert after creating git or gcrypt remote 2014-04-20 15:10:29 -04:00
http://joeyh.name/
145ba7a2aa Added a comment 2014-04-20 18:35:40 +00:00
Joey Hess
a8bd7a607d When init detects that git is not configured to commit, and sets user.email to work around the problem, also make it set user.name.
I was able to reproduce git failing to commit despite user.email being set,
in a test account on my laptop. The account had no GECOS information.
2014-04-20 14:17:57 -04:00
Joey Hess
c70a762e81 add 2014-04-20 13:55:13 -04:00
Joey Hess
405d9183aa retitle 2014-04-20 13:42:15 -04:00
http://joeyh.name/
0ce86cd0df Added a comment 2014-04-20 17:16:50 +00:00
http://joeyh.name/
545dad079d Added a comment 2014-04-20 17:11:02 +00:00
http://joeyh.name/
3c929400f6 Added a comment 2014-04-20 16:52:16 +00:00
Joey Hess
9724667a3d webapp: Fix UI for removing XMPP connection. 2014-04-20 12:46:33 -04:00
cbaines
17d2e2b346 Add bug report regarding Android App. 2014-04-20 10:33:24 +00:00
https://id.koumbit.net/anarcat
1056ae44f6 i hope i'm not being too noisy here :) 2014-04-19 22:57:01 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmp1ThsNNAbSn46ju-gwFELfStlhl8usJo
694cf9d8f9 Added a comment: Googledrive annex on second repository 2014-04-19 20:45:26 +00:00
https://www.google.com/accounts/o8/id?id=AItOawn3p4i4lk_zMilvjnJ9sS6g2nerpgz0Fjc
9ead81dde5 Added a comment: auto conflict resolution 2014-04-19 17:26:11 +00:00
https://id.koumbit.net/anarcat
a77393d6bd 2014-04-19 15:23:12 +00:00
Richard Hartmann
b6a86aa5f1 Typo 2014-04-19 16:53:18 +02:00