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

5839 commits

Author SHA1 Message Date
clement
6231b7a369 rename bugs/assistant:_synchronisation_between_to_regular_repositories_hangs_.mdwn to bugs/Assistant:_synchronisation_between_to_regular_repositories_hangs_.mdwn 2015-03-12 11:46:00 +00:00
clement
bfe29b6a1c 2015-03-12 11:00:29 +00:00
https://www.google.com/accounts/o8/id?id=AItOawlc-3pdibcizrdz4WmZooECL0k6AvM1cWc
1f8e5221a6 Added a comment: Ah, but I can directly overwrite the file 2015-03-09 17:46:58 +00:00
https://www.google.com/accounts/o8/id?id=AItOawlc-3pdibcizrdz4WmZooECL0k6AvM1cWc
684a267a72 Added a comment: direct-mode to direct-mode perhaps? 2015-03-09 17:40:59 +00:00
effigies
34cea08340 Added a comment: Strategy for getting up and running 2015-03-09 17:32:19 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmInOIq3X0IygZm4PEKlh2-aW1AGIxN97A
a03a3617e5 2015-03-07 18:48:54 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmInOIq3X0IygZm4PEKlh2-aW1AGIxN97A
b7e9a08909 2015-03-07 18:47:54 +00:00
EskildHustvedt
7b62fed767 2015-03-05 14:19:31 +00:00
Joey Hess
9b93278e8a metadata: Fix encoding problem that led to mojibake when storing metadata strings that contained both unicode characters and a space (or '!') character. 
The fix is to stop using w82s, which does not properly reconstitute unicode
strings. Instrad, use utf8 bytestring to get the [Word8] to base64. This
passes unicode through perfectly, including any invalid filesystem encoded
characters.

Note that toB64 / fromB64 are also used for creds and cipher
embedding. It would be unfortunate if this change broke those uses.

For cipher embedding, note that ciphers can contain arbitrary bytes (should
really be using ByteString.Char8 there). Testing indicated it's not safe to
use the new fromB64 there; I think that characters were incorrectly
combined.

For credpair embedding, the username or password could contain unicode.
Before, that unicode would fail to round-trip through the b64.
So, I guess this is not going to break any embedded creds that worked
before.

This bug may have affected some creds before, and if so,
this change will not fix old ones, but should fix new ones at least.
 2015-03-04 12:54:30 -04:00
madduck
c65ad7b2f1 2015-03-04 09:06:14 +00:00
Joey Hess
8efc7c0e95 Merge branch 'master' of ssh://git-annex.branchable.com 2015-03-02 16:45:14 -04:00
Joey Hess
e322826e33 Submodules are now supported by git-annex! 
Seems to work, but still experimental until it's been tested more.

When repositories are on filesystems not supporting symlinks, the .git dir
symlink trick cannot be used. Since we're going to be in direct mode
anyway, the .git dir symlink is not strictly needed.

However, I have not fixed the code that creates new annex symlinks to
handle this case -- the committed symlinks will be wrong.

git annex sync happens to currently fail in a submodule using direct mode,
because there's no HEAD ref. That also needs to be dealt with to get
this fully working in crippled filesystems.

Leaving http://github.com/datalad/datalad/issues/44 open until these issues
are dealt with.
 2015-03-02 16:43:44 -04:00
https://www.google.com/accounts/o8/id?id=AItOawlc-3pdibcizrdz4WmZooECL0k6AvM1cWc
46a943d37e 2015-03-02 17:43:15 +00:00
Eric OConnor
a7febaf081 Allow this repository to be checked out in filesystems with 255 char filename limits 2015-03-02 13:09:24 -04:00
https://www.google.com/accounts/o8/id?id=AItOawlvmWVPaSpWJO5_rimCL0lEoJRoKOIjhHE
3398bb5231 Added a comment: Why shoul git-annex support --git-dir 2015-03-01 10:10:31 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnbPKLjBONawBd74MKJZo05juCqdsP1jAU
0f72b848cf Added a comment 2015-02-27 22:06:52 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnbPKLjBONawBd74MKJZo05juCqdsP1jAU
02fcfe70ac 2015-02-27 20:16:04 +00:00
Joey Hess
ad1f4a7f1c followu 2015-02-27 16:06:57 -04:00
Joey Hess
7ddebebea8 think I found a way to support submodules 2015-02-27 15:58:01 -04:00
Joey Hess
289881bdb8 sync: As well as the synced/git-annex push, attempt a git-annex:git-annex push, as long as the remote branch is an ancestor of the local branch, to better support bare git repos. 
See my comment in the bug report for analysis; basically this is safe
because it's a non-forced push, so won't lose history. Even if it was a
forced push or somehow races, things will eventually become consistent and
no git-annex branch info will be lost.

(This used to be done, but it forgot to do it since version 4.20130909.)
 2015-02-27 14:49:56 -04:00
https://www.google.com/accounts/o8/id?id=AItOawnbPKLjBONawBd74MKJZo05juCqdsP1jAU
6cd08c7246 Added a comment 2015-02-27 01:43:42 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnbPKLjBONawBd74MKJZo05juCqdsP1jAU
b362ecfd65 removed 2015-02-27 01:42:28 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnbPKLjBONawBd74MKJZo05juCqdsP1jAU
baba042cc3 Added a comment 2015-02-27 01:41:15 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnbPKLjBONawBd74MKJZo05juCqdsP1jAU
8718bf3415 removed 2015-02-27 01:40:01 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnbPKLjBONawBd74MKJZo05juCqdsP1jAU
07419b9a22 Added a comment 2015-02-27 01:38:36 +00:00
https://id.koumbit.net/anarcat
0bee02beaa i think i figured out some weird bug... hopefully? :) 2015-02-26 23:46:52 +00:00
Joey Hess
76cde095fe Linux standalone: Set LOCPATH=/dev/null to work around https://ghc.haskell.org/trac/ghc/ticket/7695 
This prevents localization from working, but git-annex is not localized anyway.
 2015-02-25 16:31:01 -04:00
Joey Hess
a69a79498f retitle 2015-02-25 15:21:05 -04:00
Joey Hess
c05f8b3c66 close; git annex list is the command you seek 2015-02-25 14:30:59 -04:00
Joey Hess
f09a3a89c1 comment 2015-02-25 14:27:04 -04:00
Joey Hess
ed5bc57b16 followup with a transcript showing that it works.. 2015-02-25 14:14:03 -04:00
Joey Hess
3afd3b25e3 followup; version number is basic information so close useless report 2015-02-25 14:05:24 -04:00
Joey Hess
8a3e2b302a unannex: Refuse to unannex when repo is too new to have a HEAD 
In this case there must be staged changes in the index (if there is
anything to unannex), and the unannex code path needs to run with a clean
index.
 2015-02-25 13:59:23 -04:00
Joey Hess
80aa7e3571 followup 2015-02-25 13:32:21 -04:00
Joey Hess
6ab05ed161 close; dup 2015-02-25 12:56:33 -04:00
Joey Hess
d0475cea1f close 2015-02-25 12:54:59 -04:00
Joey Hess
3e5c07819e close 2015-02-25 12:54:37 -04:00
bremner
88b927b4b5 2015-02-24 07:59:25 +00:00
https://www.google.com/accounts/o8/id?id=AItOawlRZkzmh7d76UJwDPbUj7Ml_TyC9grHbXw
ccb70051d8 Added a comment: It's done 2015-02-23 22:32:16 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnx8kHW66N3BqmkVpgtXDlYMvr8TJ5VvfY
0201e42ca3 2015-02-23 21:13:00 +00:00
https://www.google.com/accounts/o8/id?id=AItOawk7iPiqWr3BVPLWEDvJhSSvcOqheLEbLNo
2a63e9405e Added a comment 2015-02-23 19:55:36 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnx8kHW66N3BqmkVpgtXDlYMvr8TJ5VvfY
01d9a4b633 2015-02-23 19:34:34 +00:00
https://www.google.com/accounts/o8/id?id=AItOawn2MI-Ci-bS9W5NITngsBJiL8LqWYcJ458
ab6941af2b 2015-02-23 11:44:36 +00:00
https://www.google.com/accounts/o8/id?id=AItOawn2MI-Ci-bS9W5NITngsBJiL8LqWYcJ458
55179ea504 2015-02-23 11:21:33 +00:00
https://www.google.com/accounts/o8/id?id=AItOawlRZkzmh7d76UJwDPbUj7Ml_TyC9grHbXw
12ea828e55 2015-02-23 00:38:32 +00:00
Joey Hess
eccc88925c Merge branch 'master' of ssh://git-annex.branchable.com 2015-02-22 14:50:19 -04:00
Joey Hess
fd2a543c7d Merge branch 'master' into database 
Conflicts:
	debian/changelog
 2015-02-22 14:12:42 -04:00
https://www.google.com/accounts/o8/id?id=AItOawnbPKLjBONawBd74MKJZo05juCqdsP1jAU
f945cb6e1a Added a comment: bug still there 2015-02-22 14:58:42 +00:00
Régis
0f6d410483 2015-02-22 10:25:50 +00:00
https://www.google.com/accounts/o8/id?id=AItOawlmLuHhscJsoAqb9q0N3LdtHum6LjY1LK4
80bb2f43e1 removed 2015-02-22 02:05:45 +00:00
https://www.google.com/accounts/o8/id?id=AItOawlmLuHhscJsoAqb9q0N3LdtHum6LjY1LK4
98b2f4da53 Added a comment 2015-02-22 02:03:59 +00:00
https://www.google.com/accounts/o8/id?id=AItOawlmLuHhscJsoAqb9q0N3LdtHum6LjY1LK4
5336deccf1 Added a comment 2015-02-22 01:47:52 +00:00
https://www.google.com/accounts/o8/id?id=AItOawlmLuHhscJsoAqb9q0N3LdtHum6LjY1LK4
d5fbc29729 Added a comment 2015-02-22 01:47:36 +00:00
https://www.google.com/accounts/o8/id?id=AItOawlmLuHhscJsoAqb9q0N3LdtHum6LjY1LK4
0b20f7846f Added a comment 2015-02-22 01:26:28 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnZDzYJnNLkYd4E1-PCAWbKldCX-5ApBCQ
5e5fe6321d 2015-02-22 01:00:16 +00:00
https://www.google.com/accounts/o8/id?id=AItOawlmLuHhscJsoAqb9q0N3LdtHum6LjY1LK4
dae374257f removed 2015-02-21 20:48:26 +00:00
https://www.google.com/accounts/o8/id?id=AItOawlmLuHhscJsoAqb9q0N3LdtHum6LjY1LK4
3a66f7385b Added a comment 2015-02-21 20:46:39 +00:00
https://www.google.com/accounts/o8/id?id=AItOawlmLuHhscJsoAqb9q0N3LdtHum6LjY1LK4
8c943c65d6 Added a comment 2015-02-21 20:46:23 +00:00
https://www.google.com/accounts/o8/id?id=AItOawlmLuHhscJsoAqb9q0N3LdtHum6LjY1LK4
3efb6b29bb Added a comment 2015-02-21 20:21:33 +00:00
http://jamestechnotes.com/
c2ad8c8aba 2015-02-20 17:05:20 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnx8kHW66N3BqmkVpgtXDlYMvr8TJ5VvfY
5da6712c3b 2015-02-20 16:47:46 +00:00
https://www.google.com/accounts/o8/id?id=AItOawmg0NqVniTETKYIWr6eyYRJnakNg0A6tRc
4e1a25f940 Added a comment 2015-02-19 11:54:14 +00:00
Joey Hess
823cc9b800 Merge branch 'master' into database 2015-02-18 14:12:34 -04:00
https://www.google.com/accounts/o8/id?id=AItOawlmLuHhscJsoAqb9q0N3LdtHum6LjY1LK4
76a946852d Added a comment 2015-02-18 12:39:17 +00:00
https://www.google.com/accounts/o8/id?id=AItOawk9nck8WX8-ADF3Fdh5vFo4Qrw1I_bJcR8
08cd37c710 Added a comment 2015-02-18 12:39:05 +00:00
https://www.google.com/accounts/o8/id?id=AItOawlmLuHhscJsoAqb9q0N3LdtHum6LjY1LK4
202f2d3a2e removed 2015-02-18 12:15:01 +00:00
https://www.google.com/accounts/o8/id?id=AItOawlmLuHhscJsoAqb9q0N3LdtHum6LjY1LK4
a3bda4dca0 Added a comment 2015-02-18 12:14:26 +00:00
Joey Hess
881bed8046 comment 2015-02-17 17:40:43 -04:00
Joey Hess
39a82a76c1 close bug 2015-02-17 17:09:21 -04:00
sairon
c6ff9385e6 Added a comment 2015-02-17 15:04:55 +00:00
https://www.google.com/accounts/o8/id?id=AItOawlmLuHhscJsoAqb9q0N3LdtHum6LjY1LK4
0f9c158222 removed 2015-02-17 14:44:58 +00:00
https://www.google.com/accounts/o8/id?id=AItOawlmLuHhscJsoAqb9q0N3LdtHum6LjY1LK4
f3b3319f9d Added a comment 2015-02-17 14:43:20 +00:00
https://www.google.com/accounts/o8/id?id=AItOawlmLuHhscJsoAqb9q0N3LdtHum6LjY1LK4
1feec604ac Added a comment 2015-02-17 14:43:02 +00:00
Joey Hess
88fbb13ee3 Linux standalone: Improved process names of linker shimmed programs. 2015-02-16 19:36:26 -04:00
Joey Hess
f4c677feeb Merge branch 'master' of ssh://git-annex.branchable.com 2015-02-16 17:15:08 -04:00
https://www.google.com/accounts/o8/id?id=AItOawnwNDA50ZupMvOgpgDqzDRyu5B-mYlVwa4
7caded119a Added a comment 2015-02-16 17:32:32 +00:00
Joey Hess
2fbbb7fab0 reviewed vcache for use by git-annex; found it wanting 2015-02-15 12:37:38 -04:00
https://id.koumbit.net/anarcat
f0ad6b2610 2015-02-13 19:03:57 +00:00
https://id.koumbit.net/anarcat
e865f34d7d 2015-02-13 18:59:54 +00:00
Joey Hess
15107d2c5a propigate ssh-options everywhere ssh caching is used 
* sync: Use the ssh-options git config when doing git pull and push.
* remotedaemon: Use the ssh-options git config.

Note that the rename env var means that if a new git-annex calls an old one
for git-annex ssh, or a new calls an old, nothing much will go wrong;
just ssh caching won't happen.
 2015-02-12 16:14:53 -04:00
Joey Hess
ecf7ef3ff2 details needed 2015-02-12 14:47:35 -04:00
Joey Hess
62590be2bb comment 2015-02-12 14:25:49 -04:00
https://www.google.com/accounts/o8/id?id=AItOawlmLuHhscJsoAqb9q0N3LdtHum6LjY1LK4
8e40499795 Added a comment 2015-02-12 17:19:40 +00:00
sairon
efcfc1823b 2015-02-12 00:49:53 +00:00
Joey Hess
07eec0b396 Merge branch 'master' of ssh://git-annex.branchable.com 2015-02-11 13:14:59 -04:00
Joey Hess
85cfc4dce8 comments 2015-02-11 13:13:36 -04:00
https://www.google.com/accounts/o8/id?id=AItOawlmLuHhscJsoAqb9q0N3LdtHum6LjY1LK4
b45041b190 Added a comment 2015-02-11 16:22:58 +00:00
https://www.google.com/accounts/o8/id?id=AItOawlmLuHhscJsoAqb9q0N3LdtHum6LjY1LK4
59ca2a72f1 removed 2015-02-11 16:09:27 +00:00
https://www.google.com/accounts/o8/id?id=AItOawlmLuHhscJsoAqb9q0N3LdtHum6LjY1LK4
d73379d921 removed 2015-02-11 15:00:21 +00:00
https://www.google.com/accounts/o8/id?id=AItOawlmLuHhscJsoAqb9q0N3LdtHum6LjY1LK4
1edc3e8f85 Added a comment: cmdline of neverending process 2015-02-11 11:17:03 +00:00
https://www.google.com/accounts/o8/id?id=AItOawlmLuHhscJsoAqb9q0N3LdtHum6LjY1LK4
75d579606b Added a comment 2015-02-11 11:16:50 +00:00
https://www.google.com/accounts/o8/id?id=AItOawlmLuHhscJsoAqb9q0N3LdtHum6LjY1LK4
f99b498783 Added a comment 2015-02-11 11:16:37 +00:00
https://www.google.com/accounts/o8/id?id=AItOawl52i_Ao3TpmLrpYMCbRcnNiMuNiwIDr4E
e7bc3107d7 Added a comment: Cross check 2015-02-10 22:58:01 +00:00
Joey Hess
f153079152 metadata: When setting metadata, do not recurse into directories by default, since that can be surprising behavior and difficult to recover from. The old behavior is available by using --force. 2015-02-10 16:06:53 -04:00
Joey Hess
36f7e5cfdf close; operator error 2015-02-10 15:30:09 -04:00
bremner
000ec8d096 2015-02-10 18:46:33 +00:00
Joey Hess
d611834903 moreinfo 2015-02-10 13:37:48 -04:00
Joey Hess
0eaefd0b29 forgot to close this when I fixed it 2015-02-10 13:35:41 -04:00
Joey Hess
340e2f822b close old bug report that was probably a misunderstanding 2015-02-10 13:33:43 -04:00
Joey Hess
0c99d16289 probably fixed in version 5.20150205 2015-02-10 13:31:58 -04:00