Commit graph

20959 commits

Author SHA1 Message Date
https://www.google.com/accounts/o8/id?id=AItOawlU0H3uyacCnqWxjSI_chHBlHu8TDIkTt0
6897efe56f Added a comment: same issue 2014-08-14 15:45:37 +00:00
justinl
ec6328d24c 2014-08-14 12:13:54 +00:00
EskildHustvedt
1ff86cfd3c Added a comment 2014-08-14 05:30:46 +00:00
Joey Hess
5270dfc823 git-am chooked on this because it has trailing whitespace. srsly? 2014-08-13 14:41:19 -04:00
Joey Hess
06a026d5b9 disable HAVE_CLOCK_GETTIME to avoid needing to port librt to android 2014-08-13 14:32:58 -04:00
Joey Hess
f6b6f14c9c update git patch 2014-08-13 13:51:32 -04:00
Joey Hess
90fdd28fd8 try to fix PATH so test suite will work 2014-08-13 13:29:27 -04:00
Joey Hess
6fe0f300a6 clean up 2014-08-13 13:21:22 -04:00
Joey Hess
7ab5c346ff typo 2014-08-13 13:03:46 -04:00
Joey Hess
75b69dca58 work aroud ongong transformers-compat cabal issue 2014-08-13 13:02:35 -04:00
Joey Hess
77d55672a9 remove old ghc libs 2014-08-13 12:48:20 -04:00
Joey Hess
e5b42b22b8 Merge branch 'master' of https://github.com/zyv/git-annex 2014-08-13 12:47:14 -04:00
Joey Hess
a4e15a7cf2 Merge branch 'master' of ssh://git-annex.branchable.com 2014-08-13 11:07:44 -04:00
Joey Hess
2868ea352a forgot I signed the git-annex key 2014-08-13 11:06:34 -04:00
Yury V. Zaytsev
e93f3b99e2 Update build.sh
Haskell Platform now lives in C:/haskell and is on %PATH% by default, msysgit/bin (and msysgit/mingw/bin) directory is also on %PATH% (last)
2014-08-13 11:56:47 +02:00
zardoz
d3061bf553 2014-08-13 08:43:19 +00:00
http://svario.it/gioele
e60bc6d4d4 Added a comment 2014-08-13 06:40:12 +00:00
http://svario.it/gioele
3e2d67960c Added a comment 2014-08-13 06:36:53 +00:00
Joey Hess
7c7e5ccdd8 devblog 2014-08-12 16:51:33 -04:00
Joey Hess
f9355a4f31 link to correct key 2014-08-12 16:51:15 -04:00
Joey Hess
fe6290a862 typo 2014-08-12 16:46:49 -04:00
Joey Hess
01eda08b32 Merge branch 'master' of ssh://git-annex.branchable.com 2014-08-12 16:42:49 -04:00
Joey Hess
2418bae471 special case edit page for web remote
The crash came from calling Git.repoLocation, but it made sense to fix this
higher up, because there is nothing to edit about the web, it just is what
it is.
2014-08-12 16:35:13 -04:00
Joey Hess
62f619c3eb more complete gpg key verification process, including statement signed with my personal key 2014-08-12 16:17:30 -04:00
https://id.koumbit.net/anarcat
d3abb3a619 Added a comment 2014-08-12 19:56:58 +00:00
http://joeyh.name/
eac61dacd1 Added a comment 2014-08-12 19:51:38 +00:00
Joey Hess
8ad5376640 close 2014-08-12 15:50:03 -04:00
http://joeyh.name/
d2879070a9 Added a comment 2014-08-12 19:49:35 +00:00
Joey Hess
2369ba4618 move bug and close it 2014-08-12 15:40:21 -04:00
Joey Hess
c963563602 Merge branch 'master' of ssh://git-annex.branchable.com 2014-08-12 15:39:27 -04:00
http://joeyh.name/
2718c78ae7 Added a comment 2014-08-12 19:37:56 +00:00
Joey Hess
fbdeeeed5f S3, Glacier, WebDAV: Fix bug that prevented accessing the creds when the repository was configured with encryption=shared embedcreds=yes.
Since encryption=shared, the encryption key is stored in the git repo, so
there is no point at all in encrypting the creds, also stored in the git
repo with that key. So `initremote` doesn't. The creds are simply stored
base-64 encoded.

However, it then tried to always decrypt creds when encryption was used..
2014-08-12 15:35:29 -04:00
http://joeyh.name/
57fb728b62 Added a comment 2014-08-12 18:58:49 +00:00
Joey Hess
631bf3cbc2 Merge branch 'master' of ssh://git-annex.branchable.com 2014-08-12 14:45:00 -04:00
Joey Hess
f0df660570 WORM backend: When adding a file in a subdirectory, avoid including the subdirectory in the key name. 2014-08-12 14:38:53 -04:00
Joey Hess
4ae25032c6 maybe better note for direct mode, although I dislike the walkthrough being complicated by direct mode at all 2014-08-12 14:30:44 -04:00
http://joeyh.name/
1782fd177c Added a comment 2014-08-12 18:24:57 +00:00
Joey Hess
b09c02b4f9 confirmed; really a git bug 2014-08-12 14:24:38 -04:00
http://joeyh.name/
6113f4cf0f Added a comment 2014-08-12 18:00:47 +00:00
http://joeyh.name/
54d4ce654b Added a comment 2014-08-12 17:57:26 +00:00
http://joeyh.name/
ee7872d3b2 Added a comment 2014-08-12 17:50:15 +00:00
http://joeyh.name/
99ee12d513 Added a comment 2014-08-12 17:48:35 +00:00
http://joeyh.name/
1ac2e022c7 Added a comment 2014-08-12 17:39:10 +00:00
http://joeyh.name/
e698bbc258 Added a comment 2014-08-12 17:33:25 +00:00
http://joeyh.name/
fb1dc71cc8 Added a comment 2014-08-12 17:29:17 +00:00
http://joeyh.name/
6f24dc28ab Added a comment 2014-08-12 17:26:46 +00:00
Joey Hess
26ceb09794 Merge branch 'master' of ssh://git-annex.branchable.com 2014-08-12 13:24:02 -04:00
Joey Hess
d8be828734 direct: Fix ugly warning messages.
replaceFileOr was broken and ran the rollback action always.
Luckily, for replaceFile, the rollback action was safe to run, since it
just nuked a temp file that had already been moved into place.

However, when `git annex direct` used replaeFileOr, its rollback printed a
scary message:

  /home/joey/tmp/rrrr/.git/annex/misctmp/tmp32268: rename: does not exist (No such file or directory)

There was actually no bad result though.
2014-08-12 13:00:08 -04:00
Joey Hess
7285896996 make windows depend on new enough unix-compat to get inode numbers 2014-08-12 12:30:40 -04:00
Joey Hess
9193d6e6bd fix build on windows with unix-compat-0.4.1.3
FileID type changed, needs Arbitrary instance.

On the plus side, getFileStatus on Windows now actually gets file id's,
not always 0, so direct mode is safer there now.
2014-08-11 17:25:31 -04:00