mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions
24158 commits 13 branches 445 tags 110 MiB
Commit graph

17648 commits

Author SHA1 Message Date
Joey Hess
7ebf234616 Stale transfer lock and info files will be cleaned up automatically when get/unused/info commands are run. 
Deleting lock files is tricky, tricky stuff. I think I got it right!
 2015-05-12 20:11:23 -04:00
Joey Hess
8c2dd7d8ee Fix an unlikely race that could result in two transfers of the same key running at once. 
As discussed in bug report.
 2015-05-12 19:39:28 -04:00
Joey Hess
1fd54e986a devblog 2015-05-12 16:36:39 -04:00
Joey Hess
5935578ed2 update 2015-05-12 14:00:53 -04:00
Joey Hess
e27b97d364 Merge branch 'master' into concurrentprogress 
Conflicts:
	Command/Fsck.hs
	Messages.hs
	Remote/Directory.hs
	Remote/Git.hs
	Remote/Helper/Special.hs
	Types/Remote.hs
	debian/changelog
	git-annex.cabal
 2015-05-12 13:23:22 -04:00
Joey Hess
587b2e9014 Merge branch 'master' of ssh://git-annex.branchable.com 2015-05-12 13:00:22 -04:00
Joey Hess
4b2e3210ea drop: Now supports --all, --unused, and --key. 2015-05-12 13:00:06 -04:00
https://me.yahoo.com/a/StKYI.ZuofVB3xNCCzjJo.V7Fg--#11600
e4b137378f 2015-05-12 15:31:56 +00:00
https://sunny256.wordpress.com/
b371a12641 Added a comment: Create symlink in the root directory 2015-05-12 13:04:18 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnwNDA50ZupMvOgpgDqzDRyu5B-mYlVwa4
581beaae1c Added a comment 2015-05-12 06:52:05 +00:00
https://me.yahoo.com/a/e1w.8yMTnpUh.5fOXneP92pTdy23XJPwx84uLSM-#aca7c
6a1bf68350 Added a comment: re: backup my data to blue ray disks 2015-05-11 21:13:19 +00:00
Joey Hess
cc5d0a3873 comment 2015-05-11 13:03:41 -04:00
Joey Hess
db5d831d07 import: Refuse to import files that are within the work tree, as that does not make sense and could cause data loss. 2015-05-11 12:57:47 -04:00
Joey Hess
c17f2d25b5 bug submitter appears to have been wrong 2015-05-11 12:05:35 -04:00
CandyAngel
a008f78e26 2015-05-11 15:52:29 +00:00
spwhitton
f6cc3fd0e9 Added a comment 2015-05-11 09:02:11 +00:00
atrent
48037ddb67 2015-05-11 07:37:33 +00:00
Joey Hess
ed4fe02896 disable horrible tab warning, needed in every file that Setup.hs pulls in 
This is certianly a cabal bug for not passing the build options in the
cabal file when building Setup.hs.

And, why oh why did ghc enable this warning by default? So unhappy with
this choice.
 2015-05-10 16:31:50 -04:00
Joey Hess
f65e7a4cce devblog 2015-05-10 16:21:38 -04:00
Joey Hess
dd069990e8 fix man page example formatting 2015-05-09 14:27:45 -04:00
https://me.yahoo.com/a/EbvxpTI_xP9Aod7Mg4cwGhgjrCrdM5s-#7c0f4
f561ecee8e 2015-05-09 14:31:32 +00:00
warp
a6d50d4a7b 2015-05-09 12:42:34 +00:00
warp
549414a911 2015-05-09 12:40:38 +00:00
Joey Hess
540e1e86b9 devblog 2015-05-08 18:56:57 -04:00
Joey Hess
883d57fa2e add news item for git-annex 5.20150508 2015-05-08 15:09:08 -04:00
Joey Hess
6a1814abf5 seems that webapp ssh password ssh-agent hack is broken on windows after recent ssh changes 2015-05-08 15:07:23 -04:00
Joey Hess
38e2b95751 use a batch file to run msysgit's ssh, instead of copying 
copying failed because dlls are not in path.

This batch file is based on the one msysgit uses to start gitk
 2015-05-08 14:26:37 -04:00
Joey Hess
54bee7dad4 Revert "Android: Updated bundled ssh from 6.1p1 to 6.4p1." 
This reverts commit 27836a2af9.

Build didn't actually seem to succeed, for both versions of android, so
I'll need to revisit this later.
 2015-05-08 13:05:33 -04:00
https://www.google.com/accounts/o8/id?id=AItOawnwNDA50ZupMvOgpgDqzDRyu5B-mYlVwa4
c71476963e 2015-05-08 15:22:53 +00:00
https://launchpad.net/~jktjkt
d5d2413cbb 2015-05-08 12:03:35 +00:00
db48x
5050377d4c 2015-05-08 08:43:37 +00:00
anton
8e96a31d9a Added a comment: Thanks! 2015-05-08 07:11:34 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkW9u-8uqR62QBZjeTNCXsL7Ds55dAMGbA
f71c23faad 2015-05-08 00:16:03 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkW9u-8uqR62QBZjeTNCXsL7Ds55dAMGbA
166c6c9281 2015-05-08 00:13:32 +00:00
Joey Hess
c101818cbe devblog 2015-05-07 19:36:48 -04:00
Joey Hess
4aba1c74bd remaining dataenc to sandi conversions 
I've tested all the dataenc to sandi conversions except Assistant.XMPP,
and all have unchanged behavior, including behavior on large unicode code
points.
 2015-05-07 18:07:13 -04:00
Joey Hess
c98a6fcf49 close 2015-05-07 15:59:55 -04:00
Joey Hess
18fc05ff04 Windows: Roll back to an older version of rsync from cygwin. The newer version has some dependency on a newer ssh from cygwin. 2015-05-07 15:56:40 -04:00
Joey Hess
ce285ea6fa Windows: Remove cygwin ssh, the newer version of which has stopped honoring the setting of HOME. Instead, copy msysgit's ssh into PATH. 2015-05-07 15:53:03 -04:00
Joey Hess
00e426f738 fix matrix 2015-05-07 15:19:29 -04:00
Joey Hess
886da3113a update 2015-05-07 14:37:13 -04:00
Joey Hess
308514a138 analysis 2015-05-07 14:26:48 -04:00
Joey Hess
3b050a46ae add bug report, point forum posts about it there 2015-05-07 14:17:28 -04:00
https://sunny256.wordpress.com/
01d7f482f5 Added a comment: Thanks 2015-05-07 14:20:49 +00:00
anton
7b3b9d9e7e Added a comment: me too 2015-05-07 09:50:10 +00:00
anton
b559871924 2015-05-07 09:07:33 +00:00
http://hendry.iki.fi/
fed463a1cc Added a comment: Two more questions 2015-05-07 07:40:41 +00:00
Joey Hess
9ce7c5dfb2 comment 2015-05-06 14:07:12 -04:00
Joey Hess
ed73adf4eb merged 2015-05-06 14:02:26 -04:00
Joey Hess
d28fc2f71a Merge branch 'master' of ssh://git-annex.branchable.com 2015-05-06 13:45:23 -04:00
Joey Hess
eeb0359a2e contentlocation, examinekey, lookupkey: Added --batch mode option. 2015-05-06 13:44:53 -04:00
Øyvind A. Holm
67347c310b Edit comment 2015-05-06 17:00:51 +02:00
https://sunny256.wordpress.com/
03461b5ff1 Added a comment: Character encoding error 2015-05-06 14:53:50 +00:00
https://sunny256.wordpress.com/
5395352b4a Add three .mailmap patches 2015-05-06 14:42:59 +00:00
madduck
62b9db3bdd Added a comment: Weirdness when run from adb shell 2015-05-06 14:28:43 +00:00
madduck
5286e1b8e1 Added a comment: TODO written 2015-05-06 14:24:56 +00:00
madduck
8d4a70933a removed 2015-05-06 14:24:28 +00:00
madduck
4ed702b6ee 2015-05-06 14:24:03 +00:00
madduck
fa77dc9952 Added a comment 2015-05-06 14:21:39 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnVnsqEy82M-MuS2gLri-az83wSQ6lXSrc
9bfc29ee32 Added a comment 2015-05-06 09:21:19 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnVnsqEy82M-MuS2gLri-az83wSQ6lXSrc
aa3ac3c4b3 2015-05-06 06:01:38 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnVnsqEy82M-MuS2gLri-az83wSQ6lXSrc
e4fcc20e26 2015-05-06 06:00:16 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnVnsqEy82M-MuS2gLri-az83wSQ6lXSrc
a49d7950e0 2015-05-06 05:58:21 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnVnsqEy82M-MuS2gLri-az83wSQ6lXSrc
b3cc89f875 removed 2015-05-06 05:49:43 +00:00
Joey Hess
16fd222113 link 2015-05-05 14:57:17 -04:00
Joey Hess
df514fc685 resonse 2015-05-05 14:50:37 -04:00
Joey Hess
7cb277c331 Merge branch 'master' of ssh://git-annex.branchable.com 2015-05-05 14:45:38 -04:00
ptb
fd3cc6d2de 2015-05-05 18:38:19 +00:00
Joey Hess
d2efae596d followup 2015-05-05 14:07:39 -04:00
Joey Hess
e535a684f9 Merge branch 'master' of ssh://git-annex.branchable.com 2015-05-05 14:05:42 -04:00
Joey Hess
cf786f42a4 Support checking ftp urls for file presence. 2015-05-05 14:05:02 -04:00
Joey Hess
0b18228516 Work around wget bug #784348 which could cause it to clobber git-annex symlinks when downloading from ftp. 2015-05-05 13:53:06 -04:00
http://xgm.de/oid/
1ab02f5e2c Added a comment 2015-05-05 17:35:38 +00:00
ka7
acac2d3770 Added a comment 2015-05-05 16:58:42 +00:00
Joey Hess
cdb212fc6f comment 2015-05-05 12:46:02 -04:00
falcone857
033cb32022 2015-05-04 22:03:50 +00:00
falcone857
0ea59aa43d 2015-05-04 22:02:13 +00:00
falcone857
398f2d7a4c 2015-05-04 22:01:24 +00:00
falcone857
ffd9c646c4 2015-05-04 22:00:47 +00:00
falcone857
d73261b1b0 2015-05-04 22:00:11 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnVnsqEy82M-MuS2gLri-az83wSQ6lXSrc
307fcca5f8 Added a comment 2015-05-02 08:28:58 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnVnsqEy82M-MuS2gLri-az83wSQ6lXSrc
ec96ddb5ad 2015-05-02 08:03:05 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnVnsqEy82M-MuS2gLri-az83wSQ6lXSrc
a3c6ad704d 2015-05-02 07:49:53 +00:00
Øyvind A. Holm
4465e970c4 Update the bug report with new and better output from 89b043d 2015-05-02 04:30:17 +02:00
https://sunny256.wordpress.com/
3898d1aaee Add bug report 2015-05-02 01:45:59 +00:00
Joey Hess
3aa671a91e close 2015-05-01 17:46:33 -04:00
Joey Hess
7f8a715029 Merge branch 'master' of ssh://git-annex.branchable.com 2015-05-01 17:44:52 -04:00
Joey Hess
70f814bc96 response 2015-05-01 17:44:14 -04:00
https://www.google.com/accounts/o8/id?id=AItOawlJl0OCe6AJEnIFIcg-t5Rhk-lI_Y-tWUs
bcd43e67e3 Added a comment: default trust for hosts 2015-05-01 21:41:05 +00:00
jamieson
6e2617ce86 Added a comment: Follow up 2015-05-01 20:40:49 +00:00
Joey Hess
66fc77a27d followup 2015-05-01 15:41:49 -04:00
Joey Hess
27836a2af9 Android: Updated bundled ssh from 6.1p1 to 6.4p1. 
Tested it builds, but have not run it yet.
 2015-05-01 15:33:29 -04:00
Joey Hess
e2ea7349a7 ping 2015-05-01 14:21:18 -04:00
Joey Hess
25d3a7995c closing; no followup and not clearly a bug 2015-05-01 14:20:05 -04:00
Joey Hess
6b6f9bcf1b close; not enough information and no followup 2015-05-01 14:14:35 -04:00
Joey Hess
3c9a76006f fix thru documentation 2015-05-01 14:13:30 -04:00
Joey Hess
c2ed961d79 close 2015-05-01 14:09:32 -04:00
Joey Hess
a64e835d83 close 2015-05-01 14:07:49 -04:00
Joey Hess
d9e72f4576 moreinfo needed 2015-05-01 14:00:50 -04:00
Joey Hess
5abe79170a close as user error 2015-05-01 13:59:27 -04:00
Joey Hess
2bc27d18d5 meant to close this earlier 2015-05-01 13:58:14 -04:00
Joey Hess
f3d78e7941 close 2015-05-01 13:57:23 -04:00
Joey Hess
437d9db41d assistant: Added --autostop to complement --autostart. 2015-05-01 13:53:45 -04:00
Joey Hess
ed97ba4bda improve --stop docs 2015-05-01 13:41:53 -04:00
Joey Hess
4af097741b fixed earlier this week actually 2015-05-01 13:40:08 -04:00
Joey Hess
aea6c18b4a fix man page synopsis 2015-05-01 13:34:32 -04:00
damien.courousse
32e0f64981 Added a comment: same behaviour when the remote repo is not reachable 2015-05-01 15:47:55 +00:00
felGru
4957de7789 properly format the patch 2015-05-01 08:13:06 +00:00
encryptio
a049989b91 2015-05-01 03:27:14 +00:00
felGru
a3459a4624 add patch for manpage of git annex pre-commit 2015-05-01 00:16:38 +00:00
encryptio
4fad4c2068 2015-04-30 21:59:28 +00:00
Joey Hess
2eef19d19d Merge branch 'master' of ssh://git-annex.branchable.com 2015-04-30 15:53:06 -04:00
Joey Hess
b45923e96a comment 2015-04-30 14:57:23 -04:00
Joey Hess
e8c6a52660 devblog 2015-04-30 14:45:11 -04:00
madduck
0ccf7102c3 Added a comment: Overwriting metadata from json 2015-04-30 18:42:46 +00:00
Joey Hess
d6609a0847 Merge branch 'master' of ssh://git-annex.branchable.com 2015-04-30 14:22:25 -04:00
Joey Hess
ac6b492711 import: Before removing a duplicate file in --deduplicate or --clean-duplicates mode, verify that enough copies of its content still exist. 2015-04-30 14:04:36 -04:00
https://id.koumbit.net/anarcat
af57e0f2fb overlap? 2015-04-30 13:33:46 +00:00
db48x
1a520e6c95 Added a comment: 14 of 21PB, actually 2015-04-30 02:58:05 +00:00
https://me.yahoo.com/a/idrn495us85k6mwfdMUolYIsyp4-#cf755
6be0a22fbc Added a comment: It's not so bad .. only about 10PB 2015-04-30 01:19:38 +00:00
db48x
5f6c8e3756 Added a comment 2015-04-29 22:56:47 +00:00
https://me.yahoo.com/a/chZVFogbu55hxJc3FfeXs.RfaA--#cc6f9
60ef5eb1f8 2015-04-29 21:26:51 +00:00
Joey Hess
cf306c261b update for jessie 2015-04-29 17:02:57 -04:00
tomekwi
9d147c5018 Added a comment 2015-04-29 20:38:51 +00:00
Joey Hess
1693c0dcd2 Merge branch 'master' of ssh://git-annex.branchable.com 2015-04-29 15:53:19 -04:00
Joey Hess
995643665a Improve integration with KDE's file manager to work with dolphin version 14.12.3 while still being compatable with 4.14.2. Thanks, silvio. 2015-04-29 15:53:16 -04:00
silvio
bc41468279 Added a comment 2015-04-29 19:47:21 +00:00
silvio
22eafb112f Added a comment 2015-04-29 19:39:33 +00:00
silvio
9d745434f9 Added a comment 2015-04-29 19:24:55 +00:00
CandyAngel
885b39b183 Added a comment 2015-04-29 18:42:38 +00:00
Joey Hess
de3c8ae6d5 comment 2015-04-29 14:07:03 -04:00
Joey Hess
79d1b378ce comment 2015-04-29 14:05:12 -04:00
Joey Hess
c3938052d9 comment 2015-04-29 14:04:08 -04:00
Joey Hess
548037223c comments 2015-04-29 13:49:09 -04:00
Joey Hess
2e54251c18 import: Check for gitignored files before moving them into the tree. (Needs git 1.8.4 or newer.) 2015-04-29 13:46:12 -04:00
Joey Hess
fab6c782a5 comment 2015-04-29 13:36:17 -04:00
Joey Hess
755da0e11e document --force 2015-04-29 13:32:50 -04:00
Joey Hess
cda2f83bad comment and improve man page 2015-04-29 13:25:10 -04:00
Joey Hess
ddcdf94162 rename to non-obnoxious name 2015-04-29 13:18:06 -04:00
Joey Hess
5ca0e7a6ef comment 2015-04-29 13:12:55 -04:00
Joey Hess
2fca1447b2 better document youtube playlists 2015-04-29 13:05:36 -04:00
Joey Hess
eab3fe8d9a close 2015-04-29 12:53:04 -04:00
Joey Hess
99dc681cda comment 2015-04-29 12:50:35 -04:00
Joey Hess
c205d58018 Merge branch 'master' of ssh://git-annex.branchable.com 2015-04-29 12:44:13 -04:00
http://rfhbuk.pip.verisignlabs.com.pip.verisignlabs.com/
a08625a000 Added a comment: comment 2 2015-04-29 15:45:34 +00:00
Joey Hess
0791770f38 comment 2015-04-29 11:31:07 -04:00
thnetos
39dea48824 2015-04-29 15:30:02 +00:00
Joey Hess
b31010ac77 comment 2015-04-29 11:24:27 -04:00
Joey Hess
29155ce8a9 comment 2015-04-29 11:22:15 -04:00
db48x
b5d91005f3 2015-04-29 05:48:05 +00:00