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

5540 commits

Author SHA1 Message Date
Joey Hess
4c429ad7ee sync: Ensure that pending changes to git-annex branch are committed when in direct mode. (Fixing a very minor reversion.) 2014-09-11 14:35:28 -04:00
http://joeyh.name/
2139c55986 Added a comment 2014-09-11 18:34:02 +00:00
http://joeyh.name/
f08a6c96f8 Added a comment 2014-09-11 18:11:43 +00:00
Joey Hess
e82eeab3c4 close 2014-09-11 14:07:35 -04:00
Joey Hess
843396ea2f Merge branch 'master' of ssh://git-annex.branchable.com 2014-09-11 14:06:26 -04:00
Joey Hess
de05ac11af document need for msysgit installer to put it into PATH 2014-09-11 14:01:08 -04:00
http://joeyh.name/
4d4e1f9237 Added a comment 2014-09-11 17:55:28 +00:00
Joey Hess
0598412e5c Fix transfer lock file FD leak that could occur when two separate git-annex processes were both working to perform the same set of transfers. 2014-09-11 13:53:26 -04:00
http://joeyh.name/
8a4d030aae Added a comment 2014-09-11 17:45:31 +00:00
Joey Hess
c489dff1a7 dup of old, long fixed bug 2014-09-11 13:45:26 -04:00
Joey Hess
80ba5b4935 close 2014-09-11 13:39:28 -04:00
Joey Hess
9ed63d1545 Promote file not found warning message to an error. 2014-09-11 13:36:28 -04:00
Joey Hess
79deba1f51 Merge branch 'master' of ssh://git-annex.branchable.com 2014-09-11 13:22:49 -04:00
Joey Hess
a97c9e43b7 The annex-rsync-transport configuration is now also used when checking if a key is present on a rsync remote, and when dropping a key from the remote. 2014-09-11 13:21:35 -04:00
pot
5961191981 2014-09-11 06:02:37 +00:00
Joey Hess
286021cebc Merge branch 'master' of ssh://git-annex.branchable.com 2014-09-10 15:15:26 -04:00
Joey Hess
3814b664a7 retitle 2014-09-10 14:27:25 -04:00
Joey Hess
11f111bf1a Fix parsing of ipv6 address in git remote address when it was not formatted as an url. 2014-09-10 14:17:02 -04:00
Joey Hess
03dae17127 close; this is not the redhat bts 2014-09-10 14:06:38 -04:00
https://www.google.com/accounts/o8/id?id=AItOawlsL6qQTFGlP3fTJkx6JdieNbb6mM63SGk
c8e0d04292 2014-09-09 23:41:56 +00:00
CandyAngel
4d42f10206 Added a comment 2014-09-08 08:08:50 +00:00
https://www.google.com/accounts/o8/id?id=AItOawk9nck8WX8-ADF3Fdh5vFo4Qrw1I_bJcR8
863c27425f Added a comment 2014-09-08 07:27:46 +00:00
https://andrew.aylett.co.uk/
b4165bd712 2014-09-07 20:50:25 +00:00
http://id.clacke.se/
90f0991f38 Added a comment: yep 2014-09-07 19:42:04 +00:00
http://id.clacke.se/
faf8987938 Added a comment: 5.20140830 2014-09-07 19:24:49 +00:00
http://id.clacke.se/
dbf4491956 initial report 2014-09-07 19:21:17 +00:00
https://andrew.aylett.co.uk/
9ea2702cc3 Added a comment 2014-09-07 18:41:28 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmTlfbCC37CAjhQrS107ZWRVA_sF4s3gLU
d61cd586d4 2014-09-07 15:27:16 +00:00
zardoz
ab1ab57f80 Added a comment 2014-09-07 14:04:51 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmLdL4zLty4fsfaIXNtPMS5RXs4y8OAk0o
545e21a593 2014-09-05 11:24:50 +00:00
Joey Hess
0881f6d45c webapp: Fixed visual glitch in xmpp pairing. 
It seems that all other uses of <div .col-sm-9> occur outside of
<div .content-box>. This one occurred inside it, when xmpp pairing.

This was introduced in the bootstrap 3 conversion.
 2014-09-04 16:18:20 -04:00
https://www.google.com/accounts/o8/id?id=AItOawlMz4vAdXg8mJm4J_Bl201w65f_lK9B6A0
63ce76805c 2014-09-03 18:50:21 +00:00
https://www.google.com/accounts/o8/id?id=AItOawlog_5wIICaMcrKTexlFNA6IO6UTp323aE
bce14a6c23 Added a comment 2014-09-01 11:01:30 +00:00
http://joeyh.name/
fa172b4d2f Added a comment 2014-08-31 22:29:44 +00:00
Ganwell
3ed723f883 2014-08-31 13:41:06 +00:00
Ganwell
6fdec95c8a 2014-08-31 13:38:43 +00:00
http://svario.it/gioele
af41726e10 Added a comment 2014-08-31 10:15:31 +00:00
http://svario.it/gioele
1d84394249 Add details to the description 2014-08-31 10:09:27 +00:00
http://svario.it/gioele
7266268297 Add global configuration to test script 2014-08-31 10:05:55 +00:00
https://www.google.com/accounts/o8/id?id=AItOawknD9ZTzo_B5NIkknx8_nBGij4-ziUGcec
3c96b79e34 2014-08-30 21:58:03 +00:00
https://www.google.com/accounts/o8/id?id=AItOawknD9ZTzo_B5NIkknx8_nBGij4-ziUGcec
e83d8a5e7d 2014-08-30 21:57:13 +00:00
annexuser
af769466b8 2014-08-30 03:44:37 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmBUR4O9mofxVbpb8JV9mEbVfIYv670uJo
a71b373727 Added a comment 2014-08-28 20:46:29 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmBUR4O9mofxVbpb8JV9mEbVfIYv670uJo
462651569d removed 2014-08-28 20:46:04 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmBUR4O9mofxVbpb8JV9mEbVfIYv670uJo
836da65d70 Added a comment 2014-08-28 20:45:11 +00:00
https://www.google.com/accounts/o8/id?id=AItOawlog_5wIICaMcrKTexlFNA6IO6UTp323aE
e845892e2b 2014-08-27 19:48:31 +00:00
https://www.google.com/accounts/o8/id?id=AItOawlog_5wIICaMcrKTexlFNA6IO6UTp323aE
c19f2bf81f 2014-08-27 19:47:29 +00:00
http://bret.io/
db58ac0a0b 2014-08-27 05:06:17 +00:00
http://bret.io/
63b0830497 Added visual bug description 2014-08-26 23:30:07 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmBmv0HhwTFxkpxlf8ifTlMOHnIwHCHTYs
f8c4d80aaa Added a comment: path on windows 2014-08-26 12:18:39 +00:00
Hans_Ryding
940b92926f Added a comment: Relying on path is not best practice in a Windows environment 2014-08-25 16:16:34 +00:00
https://www.google.com/accounts/o8/id?id=AItOawld54zdyk6b0W4jXnssSO_j2Nn3W1uVsUE
6cb0e971aa Added a comment 2014-08-24 22:26:47 +00:00
https://www.google.com/accounts/o8/id?id=AItOawld54zdyk6b0W4jXnssSO_j2Nn3W1uVsUE
230eba2fd8 Added a comment 2014-08-24 20:27:09 +00:00
https://www.google.com/accounts/o8/id?id=AItOawld54zdyk6b0W4jXnssSO_j2Nn3W1uVsUE
51f129d9f4 2014-08-24 19:59:38 +00:00
https://launchpad.net/~pauli-virtanen
bd7fd9c3d9 2014-08-23 23:12:39 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmBmv0HhwTFxkpxlf8ifTlMOHnIwHCHTYs
79ccc7e347 Added a comment: path on windows 2014-08-23 22:02:07 +00:00
https://www.google.com/accounts/o8/id?id=AItOawk7iPiqWr3BVPLWEDvJhSSvcOqheLEbLNo
99771b3404 Added a comment 2014-08-23 18:13:06 +00:00
https://www.google.com/accounts/o8/id?id=AItOawk7iPiqWr3BVPLWEDvJhSSvcOqheLEbLNo
51acb30238 2014-08-23 13:59:59 +00:00
warroyo
b768cd1262 2014-08-22 22:15:27 +00:00
zardoz
6bc2419f02 Added a comment 2014-08-22 18:57:37 +00:00
zardoz
d5bce8a3b8 Added a comment 2014-08-22 14:00:42 +00:00
zardoz
3a0d342bfd Added a comment 2014-08-22 13:15:06 +00:00
zardoz
646e36d1d1 Added a comment 2014-08-22 13:07:34 +00:00
zardoz
4f189d0134 Added a comment 2014-08-22 10:15:52 +00:00
zardoz
8002704a3f Added a comment 2014-08-22 09:58:05 +00:00
zardoz
356c782ace Added a comment 2014-08-22 09:38:03 +00:00
zardoz
ef121f0d48 Added a comment 2014-08-22 09:27:34 +00:00
zardoz
71f80ad226 2014-08-22 09:08:23 +00:00
Hans_Ryding
7e0cacd273 Added a comment: Change the name of the bug 2014-08-21 09:14:16 +00:00
Hans_Ryding
1b86daa5de Added a comment: Quite right 2014-08-21 08:54:51 +00:00
http://joeyh.name/
12b2a89e91 Added a comment 2014-08-20 14:37:31 +00:00
Hans_Ryding
dfec2ffb22 2014-08-20 11:11:54 +00:00
Hans_Ryding
45b59e0ef4 2014-08-20 11:10:39 +00:00
Hans_Ryding
e5f09276bc 2014-08-20 11:09:27 +00:00
jg123h12jh3y12g3y
2bffae54ff Added a comment: Log with --debug 2014-08-20 05:49:02 +00:00
zardoz
f78da404e5 Added a comment 2014-08-18 20:54:11 +00:00
http://joeyh.name/
10bf03aa34 Added a comment 2014-08-18 18:39:33 +00:00
zardoz
d8a50f49ed Added a comment 2014-08-16 13:58:28 +00:00
zardoz
c5267cb543 Added a comment 2014-08-16 11:42:22 +00:00
Joey Hess
ef01ff1e77 Merge branch 'master' into s3-aws 
Conflicts:
	git-annex.cabal
 2014-08-15 17:30:40 -04:00
Francois
29b219cc51 Added a comment 2014-08-15 20:51:12 +00:00
Francois
7801c53bcd Added a comment 2014-08-15 20:45:38 +00:00
Joey Hess
65e927ea56 close 2014-08-15 14:33:09 -04:00
Joey Hess
452b3536f0 Merge branch 'master' of ssh://git-annex.branchable.com 2014-08-15 14:17:10 -04:00
Joey Hess
852185c242 git-annex-shell sendkey: Don't fail if a remote asks for a key to be sent that already has a transfer lock file indicating it's being sent to that remote. The remote may have moved between networks, or reconnected. 2014-08-15 14:17:05 -04:00
http://joeyh.name/
7c563e76d2 Added a comment 2014-08-15 18:02:12 +00:00
http://joeyh.name/
c55dd8faa8 Added a comment 2014-08-15 17:52:57 +00:00
http://joeyh.name/
e236eb13db Added a comment 2014-08-15 17:46:15 +00:00
http://joeyh.name/
d48fac2ae3 Added a comment 2014-08-15 17:39:14 +00:00
Joey Hess
d6e4514444 Merge branch 'master' of ssh://git-annex.branchable.com 2014-08-15 13:38:08 -04:00
Joey Hess
bb6cec3461 direct: Avoid leaving file content in misctemp if interrupted. 2014-08-15 13:38:05 -04:00
http://joeyh.name/
2c5899ef95 Added a comment 2014-08-15 17:32:15 +00:00
https://www.google.com/accounts/o8/id?id=AItOawlU0H3uyacCnqWxjSI_chHBlHu8TDIkTt0
9a5b6558fa Added a comment: cannot connect via google apps domain 2014-08-14 15:55:07 +00:00
https://www.google.com/accounts/o8/id?id=AItOawlU0H3uyacCnqWxjSI_chHBlHu8TDIkTt0
0910f85cc5 removed 2014-08-14 15:53:48 +00:00
https://www.google.com/accounts/o8/id?id=AItOawlU0H3uyacCnqWxjSI_chHBlHu8TDIkTt0
6897efe56f Added a comment: same issue 2014-08-14 15:45:37 +00: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
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
2369ba4618 move bug and close it 2014-08-12 15:40:21 -04: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
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/
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
https://id.koumbit.net/anarcat
a40f1552c2 i believe i provided moreinto in the comments now 2014-08-11 01:58:50 +00:00
https://id.koumbit.net/anarcat
1824d56383 Added a comment: more info 2014-08-11 01:55:28 +00:00
http://svario.it/gioele
0da82b1d68 Explain the problem better 2014-08-10 15:57:33 +00:00
Joey Hess
3659cb9efb S3: finish converting to aws library 
Implemented the Retriever.

Unfortunately, it is a fileRetriever and not a byteRetriever.
It should be possible to convert this to a byteRetiever, but I got stuck:
The conduit sink needs to process individual chunks, but a byteRetriever
needs to pass a single L.ByteString to its callback for processing. I
looked into using unsafeInerlaveIO to build up the bytestring lazily,
but the sink is already operating under conduit's inversion of control,
and does not run directly in IO anyway.

On the plus side, no more memory leak..
 2014-08-09 15:58:01 -04:00
Joey Hess
1ba1e37be3 remove dead code 2014-08-09 14:30:28 -04:00
https://renaud.casenave.fr/
63321f57fa 2014-08-06 06:50:04 +00:00
jg123h12jh3y12g3y
353cf1eaca 2014-08-05 14:46:51 +00:00
http://svario.it/gioele
f12a00f159 Added a comment: Multipart S3 support files > 5 GB 2014-08-04 06:00:45 +00:00
http://joeyh.name/
63c00daa08 Added a comment 2014-08-03 18:40:26 +00:00
http://joeyh.name/
ac166a898e Added a comment 2014-08-03 18:27:32 +00:00
http://joeyh.name/
699a0a3bf8 Added a comment 2014-08-03 18:22:58 +00:00
http://joeyh.name/
51f774f8c8 Added a comment 2014-08-02 23:13:41 +00:00
http://joeyh.name/
2ca8ddca0f Added a comment 2014-08-02 23:08:44 +00:00
zardoz
670f4d43e3 2014-08-02 12:21:38 +00:00
https://www.google.com/accounts/o8/id?id=AItOawm8BAEUyzYhORZmMuocRTk4M-3IumDm5VU
e1713220bc Added a comment: Bug still valid 2014-07-31 08:35:30 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmwjQzWgiD7_I3zw-_91rMRf_6qoThupis
76d546adac Added a comment 2014-07-30 20:33:44 +00:00
http://svario.it/gioele
53518beb1c new bug: whereis does not work in direct mode 2014-07-29 15:17:09 +00:00
http://svario.it/gioele
2695dfbab5 Added a comment 2014-07-29 14:25:19 +00:00
https://id.koumbit.net/anarcat
61c31be21e found some files in misctmp 2014-07-28 22:56:14 +00:00
https://id.koumbit.net/anarcat
d6b8d63e16 2014-07-28 22:50:39 +00:00
https://id.koumbit.net/anarcat
9cb01f3a6e 2014-07-28 22:47:54 +00:00
https://id.koumbit.net/anarcat
3a5da63dc3 back from the dead, or not 2014-07-28 22:40:43 +00:00
gernot
955f2ab4c1 2014-07-28 17:16:24 +00:00
divB
6249c5f30b 2014-07-27 23:16:19 +00:00
divB
b886ed1e25 2014-07-27 23:15:25 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmURXBzaYE1gmVc-X9eLAyDat_6rHPl670
45a5276e23 added output of ls -lb in git directory to show that the file is not added to the annex 2014-07-26 16:50:32 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmURXBzaYE1gmVc-X9eLAyDat_6rHPl670
7bdac3a96b 2014-07-26 16:39:41 +00:00
https://www.google.com/accounts/o8/id?id=AItOawk9nck8WX8-ADF3Fdh5vFo4Qrw1I_bJcR8
712465c80e Added a comment 2014-07-26 14:57:53 +00:00
https://www.google.com/accounts/o8/id?id=AItOawlVUq_c3-lrQBculOEUu3yjvdavE7JbvEI
b43a6bc7e5 Added a comment 2014-07-25 10:02:53 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnG_weCiH6IleQfVmRPmFJflHQMHdAcDkU
5820a8d3cd file a bug 2014-07-25 07:42:52 +00:00
markusk
6df94fb489 Added a comment 2014-07-23 23:18:37 +00:00
http://joeyh.name/
7eb483156d Added a comment 2014-07-23 22:10:37 +00:00
Joey Hess
d82d9b4f30 Merge branch 'master' of ssh://git-annex.branchable.com 2014-07-23 17:56:31 -04:00
markusk
0ae8bef4dd 2014-07-23 21:45:18 +00:00
markusk
ce7a8d895f 2014-07-23 21:01:22 +00:00
markusk
19a0c16232 New bug using webapp with --listen=IP:Port 2014-07-23 20:29:40 +00:00
http://joeyh.name/
c8b2e701ef Added a comment 2014-07-23 15:14:22 +00:00
Joey Hess
95590f878d Merge branch 'master' of ssh://git-annex.branchable.com 2014-07-23 11:06:05 -04:00
http://joeyh.name/
48bb63b034 Added a comment 2014-07-23 15:05:36 +00:00
Joey Hess
28b355e98c close; not a git-annex bug 2014-07-23 11:04:29 -04:00
https://www.google.com/accounts/o8/id?id=AItOawkt8DjG40gowj_ETchFLDS_Z216tr7p1xw
d2894d7e48 Added a comment: ok some progress 2014-07-23 14:27:51 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkt8DjG40gowj_ETchFLDS_Z216tr7p1xw
dcc43ef57a 2014-07-23 10:36:34 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmMLeU-zCzx2mc5pL2XT8a1UNkQwHAHjg8
98fda2fc5f Added a comment 2014-07-22 02:10:14 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmMLeU-zCzx2mc5pL2XT8a1UNkQwHAHjg8
37797784f3 Added a comment 2014-07-22 01:47:29 +00:00
http://joeyh.name/
9b4f745aeb Added a comment 2014-07-21 17:37:22 +00:00
Mesar Hameed
57f735b520 fix typos. 2014-07-19 23:57:04 +01:00
EskildHustvedt
ecd7a6f3af Added a comment 2014-07-19 06:22:57 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmMLeU-zCzx2mc5pL2XT8a1UNkQwHAHjg8
40bf158ac2 typo 2014-07-18 15:01:01 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmMLeU-zCzx2mc5pL2XT8a1UNkQwHAHjg8
b4e27de274 minor addition 2014-07-18 10:21:15 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmMLeU-zCzx2mc5pL2XT8a1UNkQwHAHjg8
7465fb4981 minor fix 2014-07-18 00:38:29 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmMLeU-zCzx2mc5pL2XT8a1UNkQwHAHjg8
a2124a2797 minor change 2014-07-18 00:33:04 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmMLeU-zCzx2mc5pL2XT8a1UNkQwHAHjg8
dd8d9b4e25 bug report: git annex deleting content 2014-07-18 00:32:29 +00:00
https://www.google.com/accounts/o8/id?id=AItOawncukUQl56TwiBJb7dIyAqP1YirNg_wjR4
894305ad11 Added a comment: Actions -> Sync Now in webapp does properly download new files 2014-07-17 13:50:07 +00:00
https://www.google.com/accounts/o8/id?id=AItOawncukUQl56TwiBJb7dIyAqP1YirNg_wjR4
5a7d4ff4ae Added a comment 2014-07-17 01:58:29 +00:00
https://www.google.com/accounts/o8/id?id=AItOawncukUQl56TwiBJb7dIyAqP1YirNg_wjR4
937f434e90 removed 2014-07-17 01:48:43 +00:00
https://www.google.com/accounts/o8/id?id=AItOawncukUQl56TwiBJb7dIyAqP1YirNg_wjR4
a615192985 Added a comment 2014-07-17 01:47:43 +00:00
divB
212b3ee3f6 Added a comment 2014-07-16 23:53:39 +00:00
http://joeyh.name/
38829d82d2 Added a comment 2014-07-16 22:23:50 +00:00
https://www.google.com/accounts/o8/id?id=AItOawncukUQl56TwiBJb7dIyAqP1YirNg_wjR4
8318925d88 Added a comment 2014-07-16 21:23:00 +00:00
http://joeyh.name/
6b84327b73 Added a comment 2014-07-16 20:51:36 +00:00
http://joeyh.name/
46aa109672 Added a comment 2014-07-16 20:36:32 +00:00
https://www.google.com/accounts/o8/id?id=AItOawk9nck8WX8-ADF3Fdh5vFo4Qrw1I_bJcR8
254df802ea Added a comment 2014-07-16 20:32:57 +00:00
Joey Hess
3cdbeb5e3c Merge branch 'master' of ssh://git-annex.branchable.com 2014-07-16 16:19:27 -04:00
http://joeyh.name/
36de128756 Added a comment 2014-07-16 20:18:50 +00:00
Joey Hess
aacd5c6994 Windows: fix crash after 10 minutes 
getLine in waitForTermination doesn't work when stdin is closed..
Just loop forever, there was no reason to getLine here I think.
 2014-07-16 15:42:12 -04:00
http://joeyh.name/
f30dff1581 Added a comment 2014-07-16 18:38:51 +00:00
http://joeyh.name/
e6d76cc17e Added a comment 2014-07-16 18:21:24 +00:00
Joey Hess
a2a9650514 Merge branch 'master' of ssh://git-annex.branchable.com 2014-07-16 14:17:59 -04:00
http://joeyh.name/
06265c22af Added a comment 2014-07-16 18:18:11 +00:00
Joey Hess
4a0ddf6ca8 confirmed 2014-07-16 14:16:22 -04:00
http://joeyh.name/
3da1523634 Added a comment 2014-07-16 18:08:26 +00:00
https://www.google.com/accounts/o8/id?id=AItOawk9nck8WX8-ADF3Fdh5vFo4Qrw1I_bJcR8
117309d148 Added a comment 2014-07-16 13:42:16 +00:00
divB
5402dd4d9f Added a comment 2014-07-15 22:02:41 +00:00
Joey Hess
7e75fa82c6 close 2014-07-15 17:37:42 -04:00
http://joeyh.name/
568cc3ea64 Added a comment 2014-07-15 21:06:23 +00:00
divB
17a73f0022 Added a comment 2014-07-15 20:51:07 +00:00
http://joeyh.name/
02ee23f3bb Added a comment 2014-07-15 20:42:16 +00:00
http://joeyh.name/
0280108372 Added a comment 2014-07-15 19:15:13 +00:00
Joey Hess
4e44bda4cc Merge branch 'master' of ssh://git-annex.branchable.com 2014-07-15 14:28:21 -04:00
http://joeyh.name/
d2ef0ba3ca Added a comment 2014-07-15 17:36:22 +00:00
Joey Hess
a3d73a2cb3 meant to close this before 2014-07-15 13:35:23 -04:00
jg123h12jh3y12g3y
daf1683321 Added a comment 2014-07-15 07:58:15 +00:00
divB
f6d817c2c4 2014-07-15 05:00:53 +00:00
divB
17c106bb89 2014-07-15 04:43:45 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmN5jDf53oRJZsTo8Ahj2uXzCzq6HcvEro
622a3761ae Added a comment: confirmed? 2014-07-15 01:29:00 +00:00
lex
69bd61e559 Added a comment 2014-07-14 22:21:32 +00:00
Joey Hess
63090c50fc Merge branch 'master' of ssh://git-annex.branchable.com 2014-07-14 16:56:07 -04:00
http://joeyh.name/
c1ee43a616 Added a comment 2014-07-14 20:54:32 +00:00
Joey Hess
909f04aee2 metadata 2014-07-14 16:53:21 -04:00
http://joeyh.name/
4377c1fc88 Added a comment 2014-07-14 20:15:07 +00:00
http://joeyh.name/
538823f509 Added a comment 2014-07-14 18:47:21 +00:00
Joey Hess
2416ed18c4 Merge branch 'master' of ssh://git-annex.branchable.com 2014-07-14 14:37:48 -04:00
Joey Hess
b0c5704ae3 already fixed 2014-07-14 14:37:42 -04:00
Joey Hess
618b1d2a38 improve documentation 2014-07-14 14:37:14 -04:00
annexuser
98333c511d Added a comment 2014-07-14 18:21:00 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmveNWaFIL1zEehHr_0416bKBzsul5tGlE
e86807ea0b 2014-07-14 10:11:31 +00:00
jg123h12jh3y12g3y
09d9aa656e 2014-07-14 02:08:55 +00:00
jg123h12jh3y12g3y
5254ef67ba 2014-07-14 02:05:14 +00:00
lex
48868f5b01 2014-07-13 06:52:38 +00:00
http://svario.it/gioele
68455bbe4e New bug "sync does not commit with alwasycommit = false" 2014-07-12 10:59:49 +00:00
https://me.yahoo.com/a/FHnTlSBo1eCGJRwueeKeB6.RCaPbGMPr5jxx8A--#ce0d8
2f54ec7727 Added a comment 2014-07-12 10:03:07 +00:00
https://me.yahoo.com/a/FHnTlSBo1eCGJRwueeKeB6.RCaPbGMPr5jxx8A--#ce0d8
191477bb9f Added a comment 2014-07-12 10:00:59 +00:00
http://joeyh.name/
0f43fc0116 Added a comment 2014-07-11 19:57:36 +00:00
Joey Hess
003ebf58f5 Merge branch 'master' of ssh://git-annex.branchable.com 2014-07-11 15:53:02 -04:00
Joey Hess
aadf11cf99 moreinfo 2014-07-11 15:52:54 -04:00
http://joeyh.name/
53e1d72a30 Added a comment: unable to reproduce, please provide transcript 2014-07-11 19:36:37 +00:00
Joey Hess
793004e2c2 moreinfo 2014-07-11 15:34:41 -04:00
Joey Hess
c5f132e3e7 uninit: Avoid failing final removal in some direct mode repositories due to file modes. 
Specifically .map files.
 2014-07-11 14:52:53 -04:00
Joey Hess
ee9ffcd940 Merge branch 'master' of ssh://git-annex.branchable.com 2014-07-11 14:30:59 -04:00
http://joeyh.name/
76ff54c246 Added a comment 2014-07-11 18:27:44 +00:00
http://joeyh.name/
694a44b464 Added a comment 2014-07-11 18:15:09 +00:00
Joey Hess
e8845fc9b5 close; local misconfiguration 2014-07-11 14:13:24 -04:00
http://joeyh.name/
ad1eabe61d Added a comment: obvious questions 2014-07-11 18:12:44 +00:00
https://www.google.com/accounts/o8/id?id=AItOawncukUQl56TwiBJb7dIyAqP1YirNg_wjR4
da4be5c108 Added a comment 2014-07-11 18:10:06 +00:00
http://joeyh.name/
e265748fd7 Added a comment 2014-07-11 18:09:51 +00:00
Joey Hess
f22a77890e improve documentation about sync 2014-07-11 14:08:40 -04:00
https://www.google.com/accounts/o8/id?id=AItOawncukUQl56TwiBJb7dIyAqP1YirNg_wjR4
91f834d20e Added a comment 2014-07-11 17:11:41 +00:00
https://www.google.com/accounts/o8/id?id=AItOawncukUQl56TwiBJb7dIyAqP1YirNg_wjR4
6a2ae73f42 Added a comment 2014-07-11 17:06:43 +00:00
zardoz
07c322752c 2014-07-11 13:27:00 +00:00
CandyAngel
3355275161 Added a comment 2014-07-11 10:57:58 +00:00
CandyAngel
f59fc3da9f Added a comment 2014-07-11 10:41:23 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmveNWaFIL1zEehHr_0416bKBzsul5tGlE
ff6f62e544 2014-07-11 10:08:06 +00:00
http://svario.it/gioele
bcf5c41904 New bug: git-annex sync does not push 2014-07-11 09:25:14 +00:00
http://svario.it/gioele
b0eef01f37 Added a comment: GPG_AGENT_INFO was already set in the outside shell 2014-07-11 07:19:45 +00:00
http://joeyh.name/
fe80c9897a Added a comment 2014-07-10 19:59:15 +00:00
Joey Hess
32b2f2af38 moreinfo 2014-07-10 15:26:04 -04:00
Joey Hess
f0fc2568d7 move to todo 2014-07-10 15:18:12 -04:00
Joey Hess
088816353e Merge branch 'master' of ssh://git-annex.branchable.com 2014-07-10 15:18:02 -04:00
http://joeyh.name/
d651e3cf7a Added a comment 2014-07-10 19:19:36 +00:00
http://joeyh.name/
2a7fd68d47 Added a comment 2014-07-10 19:10:15 +00:00
Joey Hess
be2c77d0cb close 2014-07-10 15:08:30 -04:00
Joey Hess
3c10d8ce57 retitle 2014-07-10 15:05:01 -04:00
Joey Hess
b9892e2344 Merge branch 'master' of ssh://git-annex.branchable.com 2014-07-10 15:02:30 -04:00
http://joeyh.name/
56b2b49440 Added a comment: user misconfiguration 2014-07-10 19:02:00 +00:00
Joey Hess
5d34472f82 close; user misconfiguration 2014-07-10 15:00:22 -04:00
http://joeyh.name/
4f62105aa3 Added a comment 2014-07-10 18:48:17 +00:00
Joey Hess
e538f0e980 notabug 2014-07-10 14:24:46 -04:00
http://joeyh.name/
fc48c3bb23 Added a comment 2014-07-10 18:24:17 +00:00
Joey Hess
4c61590541 tagging 2014-07-10 14:22:54 -04:00
http://joeyh.name/
50781a4a5f Added a comment 2014-07-10 18:11:22 +00:00
Joey Hess
f15d2aa35d update 2014-07-09 16:16:32 -04:00
Joey Hess
566e8041ae Merge branch 'master' of ssh://git-annex.branchable.com 2014-07-09 15:32:21 -04:00
http://joeyh.name/
dd171168e4 Added a comment: more confirmation of race theory 2014-07-09 19:26:55 +00:00
Joey Hess
99521fee79 close, with fairly high confidence, but not certainty, due to difficulty reproducing races.. 2014-07-09 15:21:27 -04:00
Joey Hess
6fe35aab87 Really fix bug that caused the assistant to make many unncessary empty merge commits. 2014-07-09 15:18:00 -04:00
Joey Hess
d76b5a674f Merge branch 'master' of ssh://git-annex.branchable.com 2014-07-09 15:09:49 -04:00
Joey Hess
58acaf8026 prospective fix for bad_merge_commit_deleting_all_files 
Assuming my analysis of a race is correct. In any case, this certianly closes a
race..
 2014-07-09 15:08:19 -04:00
http://joeyh.name/
2e102ce248 Added a comment 2014-07-09 19:01:33 +00:00
http://joeyh.name/
73271cbcf4 Added a comment 2014-07-09 19:00:35 +00:00
Joey Hess
4915f9ad03 format 2014-07-09 14:50:42 -04:00
http://jamesjustjames.wordpress.com/
dbfab63576 removed 2014-07-09 18:51:27 +00:00
http://jamesjustjames.wordpress.com/
bf2ac843d2 Added a comment: The guy with this bug. 2014-07-09 18:50:36 +00:00
http://jamesjustjames.wordpress.com/
36de0da227 Added a comment: The guy with this bug. 2014-07-09 18:50:25 +00:00
http://joeyh.name/
07bb6b3748 Added a comment 2014-07-09 18:36:36 +00:00
http://joeyh.name/
5fe0f1e939 Added a comment: theory 2014-07-09 18:31:07 +00:00
http://joeyh.name/
b76295a396 Added a comment 2014-07-09 18:25:08 +00:00
http://joeyh.name/
7871699567 Added a comment 2014-07-09 18:20:14 +00:00
Joey Hess
4de0b1693e more info 2014-07-09 13:43:22 -04:00
Joey Hess
6272d09031 bug 2014-07-09 13:39:02 -04:00
http://svario.it/gioele
9ca4270cce new bug gpg does not ask for password inside tmux 2014-07-09 16:54:27 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmTNrhkVQ26GBLaLD5-zNuEiR8syTj4mI8
856bfcfccf Added a comment: Same happening here 2014-07-09 14:45:32 +00:00
http://mildred.fr/
855409db88 2014-07-09 14:17:04 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnu1NjsjNS3m0OxiYLKO-5SKNpSERxpi6k
ac4149706f Added a comment 2014-07-09 13:56:31 +00:00
zardoz
6b165db9cc Added a comment 2014-07-09 09:02:59 +00:00
zardoz
7ed729ae51 Added a comment 2014-07-09 08:51:22 +00:00
zardoz
b78752480e 2014-07-09 08:39:58 +00:00
EskildHustvedt
3cf23c5b47 Added a comment 2014-07-09 00:24:37 +00:00
EskildHustvedt
99424c47d4 Reopening 2014-07-09 00:15:19 +00:00
https://www.google.com/accounts/o8/id?id=AItOawn0aWOz5xMj5VuexPl55h7IasQnsh7sVwE
4f5a81dac4 Added a comment: It works now 2014-07-08 22:47:08 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnNqLKszWk9EoD4CDCqNXJRIklKFBCN1Ao
15f3602f61 Added a comment: package in debian backports shows the same error mesage 2014-07-08 19:25:19 +00:00
zardoz
c61fdd140e Added a comment 2014-07-08 19:17:29 +00:00
Joey Hess
7db532d53b Merge branch 'master' of ssh://git-annex.branchable.com 2014-07-08 13:57:39 -04:00
Joey Hess
ba42b67c70 Fix bug in automatic merge conflict resolution 
When one side is an annexed symlink, and the other side is a non-annexed symlink.

In this case, git-merge does not replace the annexed symlink in the work
tree with the non-annexed symlink, which is different from it's handling of
conflicts between annexed symlinks and regular files or directories.
So, while git-annex generated the correct merge commit, the work tree
didn't get updated to reflect it.
See comments on bug for additional analysis.

Did not add this to the test suite yet; just unloaded a truckload of firewood
and am feeling lazy.

This commit was sponsored by Adam Spiers.
 2014-07-08 13:55:11 -04:00
http://joeyh.name/
3dcb349409 Added a comment: analysis 2014-07-08 17:52:59 +00:00
Joey Hess
1d966dbe37 confirmed 2014-07-08 12:57:43 -04:00
Joey Hess
67c4cef5e9 fixed 2014-07-08 12:57:13 -04:00
http://joeyh.name/
8c9c55c8ce Added a comment 2014-07-08 16:44:32 +00:00
https://me.yahoo.com/a/FHnTlSBo1eCGJRwueeKeB6.RCaPbGMPr5jxx8A--#ce0d8
42df533f9c 2014-07-08 14:06:31 +00:00
CandyAngel
ac8f1925be 2014-07-08 11:56:54 +00:00
EskildHustvedt
e66d336976 Added a comment 2014-07-08 08:13:40 +00:00
https://www.google.com/accounts/o8/id?id=AItOawn0aWOz5xMj5VuexPl55h7IasQnsh7sVwE
2de177aba4 2014-07-08 00:34:53 +00:00
Joey Hess
f0c48e8591 moreinfo 2014-07-07 13:42:46 -04:00
Joey Hess
8116d10b8f Merge branch 'master' of ssh://git-annex.branchable.com 2014-07-07 13:31:22 -04:00
Joey Hess
da3d7a369b confirm 2014-07-07 13:31:13 -04:00
http://joeyh.name/
09ac7438d3 Added a comment 2014-07-07 17:19:03 +00:00
http://joeyh.name/
3d054deb7d Added a comment 2014-07-07 17:17:50 +00:00
zardoz
8037a3ad73 Added a comment 2014-07-07 14:09:33 +00:00
zardoz
27bc6d8425 2014-07-07 13:48:44 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnOSgFb3l7nL3Fs7Y9gPGJJjFiV7aJ1tek
8a1351cea5 Added a comment 2014-07-05 22:29:01 +00:00
http://joeyh.name/
bf03ab3874 Added a comment 2014-07-05 21:55:46 +00:00
http://joeyh.name/
6cdcdea98b 2014-07-05 21:48:42 +00:00
http://joeyh.name/
cd6c771715 Added a comment 2014-07-05 21:17:17 +00:00
Joey Hess
eed552609c Merge branch 'master' of ssh://git-annex.branchable.com 2014-07-05 17:13:19 -04:00
Joey Hess
4a66cd3f91 assistant: Fix bug, introduced in last release, that caused the assistant to make many unncessary empty merge commits. 2014-07-05 17:12:05 -04:00
https://www.google.com/accounts/o8/id?id=AItOawnOSgFb3l7nL3Fs7Y9gPGJJjFiV7aJ1tek
5969ae14e5 2014-07-05 20:57:04 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnOSgFb3l7nL3Fs7Y9gPGJJjFiV7aJ1tek
9d7388745e 2014-07-05 20:56:04 +00:00
http://joeyh.name/
e08ef580ed Added a comment 2014-07-05 20:34:39 +00:00
EskildHustvedt
5ace35dfb9 2014-07-05 05:15:58 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnOSgFb3l7nL3Fs7Y9gPGJJjFiV7aJ1tek
f973499dad Added a comment 2014-07-04 22:30:45 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnOSgFb3l7nL3Fs7Y9gPGJJjFiV7aJ1tek
e38fec4f52 Added a comment 2014-07-04 22:28:27 +00:00
http://joeyh.name/
b5659c2a68 Added a comment 2014-07-04 22:09:38 +00:00
Joey Hess
e0fc5bebab Merge branch 'master' of ssh://git-annex.branchable.com 2014-07-04 18:01:02 -04:00
http://joeyh.name/
3208b70a7f Added a comment 2014-07-04 21:10:17 +00:00
Joey Hess
1c036d08eb
Merge branch 'master' of ssh://git-annex.branchable.com 2014-07-04 16:40:05 -04:00
http://joeyh.name/
0d0451fca5 Added a comment 2014-07-04 19:53:43 +00:00
http://joeyh.name/
0a1875e508 Added a comment 2014-07-04 19:38:19 +00:00
Joey Hess
a2662088e3
dup 2014-07-04 15:34:55 -04:00
Joey Hess
2622fd3192
Merge branch 'master' of ssh://git-annex.branchable.com 2014-07-04 15:28:58 -04:00
Joey Hess
e6330988dd
Fix memory leak when committing millions of changes to the git-annex branch 
Eg after git-annex add has run on 2 million files in one go.

Slightly unhappy with the neeed to use a temp file here, but I cannot see
any other alternative (see comments on the bug report).

This commit was sponsored by Hamish Coleman.
 2014-07-04 15:28:07 -04:00
http://joeyh.name/
c85d20d02e Added a comment 2014-07-04 19:26:00 +00:00
http://joeyh.name/
4b43f4e481 Added a comment 2014-07-04 18:36:49 +00:00
http://joeyh.name/
d0dbaddb46 Added a comment 2014-07-04 18:24:51 +00:00
Joey Hess
8f67151f2a
Merge branch 'master' of ssh://git-annex.branchable.com 2014-07-04 14:17:11 -04:00
Joey Hess
32fc3abfdd
bug report 2014-07-04 14:15:38 -04:00
http://joeyh.name/
e6ca67244b Added a comment 2014-07-04 17:58:10 +00:00
http://joeyh.name/
6f2058e1e6 Added a comment 2014-07-04 17:52:41 +00:00
http://joeyh.name/
024086804b Added a comment 2014-07-04 17:52:35 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnOSgFb3l7nL3Fs7Y9gPGJJjFiV7aJ1tek
15e151726a Added a comment 2014-07-04 16:25:53 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnOSgFb3l7nL3Fs7Y9gPGJJjFiV7aJ1tek
6a62713b20 removed 2014-07-04 16:25:14 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnOSgFb3l7nL3Fs7Y9gPGJJjFiV7aJ1tek
fff29ecc2d Added a comment 2014-07-04 16:23:58 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnOSgFb3l7nL3Fs7Y9gPGJJjFiV7aJ1tek
4a1324fc85 removed 2014-07-04 16:22:43 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnOSgFb3l7nL3Fs7Y9gPGJJjFiV7aJ1tek
cc46318cfd Added a comment 2014-07-04 16:21:36 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnOSgFb3l7nL3Fs7Y9gPGJJjFiV7aJ1tek
73b16289c1 2014-07-04 15:36:21 +00:00
Joey Hess
3867c3d3bc Merge branch 'master' of ssh://git-annex.branchable.com 2014-07-03 16:41:13 -04:00
http://joeyh.name/
9a1f130294 Added a comment 2014-07-03 20:13:57 +00:00
Joey Hess
63af52b17f close as dup 2014-07-03 16:12:19 -04:00
http://joeyh.name/
6e3a298029 Added a comment 2014-07-03 20:10:41 +00:00
Joey Hess
03b40d6e4c Merge branch 'master' of ssh://git-annex.branchable.com 2014-07-03 16:03:28 -04:00
Joey Hess
ecddaffd3e Android: patch git to avoid fchmod, which fails on /sdcard. 2014-07-03 16:02:42 -04:00
https://www.google.com/accounts/o8/id?id=AItOawnxFr-i4nNUVrj3PJ_JKhp7GtZ5Xom7-3w
4c2668b17f Added a comment: Errors from Screenshots 2014-07-03 20:00:25 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnxFr-i4nNUVrj3PJ_JKhp7GtZ5Xom7-3w
a40a9815da removed 2014-07-03 19:58:04 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnxFr-i4nNUVrj3PJ_JKhp7GtZ5Xom7-3w
02ded1ad56 Added a comment: Errors from Screenshots 2014-07-03 19:56:58 +00:00
Joey Hess
e0c02c8621 Merge branch 'master' of ssh://git-annex.branchable.com 2014-07-03 15:34:10 -04:00
Joey Hess
a3b0fb8330 close 2014-07-03 15:04:16 -04:00
http://joeyh.name/
cb08e06db5 Added a comment 2014-07-03 19:03:52 +00:00
https://www.google.com/accounts/o8/id?id=AItOawm7eqCMh_B7mxE0tnchbr0JoYu11FUAFRY
2d6342c076 2014-07-03 10:01:45 +00:00
https://www.google.com/accounts/o8/id?id=AItOawm7eqCMh_B7mxE0tnchbr0JoYu11FUAFRY
3517600b95 rename bugs/On_Lubuntu_14.04_assistant_fails_to_create_new_setup___40__fixed_by_regular_update_from_2014-06-30__41__.mdwn to bugs/On_Lubuntu_14.04_assistant_fails_to_create_new_setup_or_actually_work___40__fixed_by_regular_lxsession_package_update_from_2014-06-30__41__.mdwn 2014-07-03 10:00:54 +00:00
https://www.google.com/accounts/o8/id?id=AItOawm7eqCMh_B7mxE0tnchbr0JoYu11FUAFRY
7838c6e139 rename bugs/On_Ubuntu_14.04_assistant_fails_to_create_new_setup.mdwn to bugs/On_Lubuntu_14.04_assistant_fails_to_create_new_setup___40__fixed_by_regular_update_from_2014-06-30__41__.mdwn 2014-07-03 09:59:29 +00:00
https://www.google.com/accounts/o8/id?id=AItOawm7eqCMh_B7mxE0tnchbr0JoYu11FUAFRY
376a72553e Added a comment: Cconfirmed it was a LXDE issue, now fixed. 2014-07-03 09:58:24 +00:00
josch
84d74c6c13 2014-07-03 06:28:07 +00:00
josch
8c172ffb4a 2014-07-03 06:27:32 +00:00
Joey Hess
68f64de905 Merge branch 'master' of ssh://git-annex.branchable.com 2014-07-02 13:40:35 -04:00