Commit graph

5779 commits

Author SHA1 Message Date
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