Commit graph

33997 commits

Author SHA1 Message Date
Joey Hess
ed2a8498a4
fix build w/o libmagic 2019-02-09 13:49:46 -04:00
Joey Hess
37d698cdad
update 2019-02-08 15:26:15 -04:00
Joey Hess
b9a1db8068
update copyright metadata for recent changes
List all current AGPL files in COPYRIGHT; several that were GPL have had
new AGPL code added.

In git-annex.cabal, use AGPL-3 as the overall license, since it's not
possible to build git-annex without AGPL code anymore.
2019-02-08 15:19:11 -04:00
Joey Hess
3fa6be1fef
Added NetworkBSD build flag to deal with Network.BSD moving to a new package.
Like with the network-uri split, cabal will automatically turn off the flag
when building with an old network.

I have not tested building with the new network-3.0.0.0 yet; several
other dependencies including aws are still pinned on network-2.*
2019-02-08 13:36:39 -04:00
Joey Hess
6b0680bd87
Merge branch 'master' of ssh://git-annex.branchable.com 2019-02-08 13:28:19 -04:00
Joey Hess
9d53e1cddf
add a missing import 2019-02-08 13:24:21 -04:00
kyle
1d7b45460e add kyle 2019-02-08 17:22:43 +00:00
Joey Hess
6cba1950f2
avoid importing Git into module used by Setup
That would have needed Setup-Depends to include unix and other
libraries.
2019-02-08 13:16:10 -04:00
guzik.sergey@9391b6c15e4938a539e36fbe5bab71df07111d2e
55a9a58e1e Added a comment 2019-02-08 11:00:15 +00:00
anarcat
d94ba4f150 a common weird experience with git-annex 2019-02-07 21:34:37 +00:00
anarcat
65f21edcac Added a comment 2019-02-07 21:10:19 +00:00
anarcat
9776c083ad Added a comment: not uploads 2019-02-07 20:59:13 +00:00
Ilya_Shlyakhter
6adad325a3 Added a comment 2019-02-07 20:45:11 +00:00
Joey Hess
b7a793c00c
response 2019-02-07 16:30:06 -04:00
Joey Hess
e4c33aad71
Merge branch 'master' of ssh://git-annex.branchable.com 2019-02-07 16:27:43 -04:00
Joey Hess
5d98028720
followup 2019-02-07 16:25:32 -04:00
anarcat
9f55cfc661 Added a comment: use cost then? 2019-02-07 20:19:14 +00:00
Joey Hess
add655fc6f
comment 2019-02-07 16:16:31 -04:00
Joey Hess
b6df092f56
close 2019-02-07 16:12:07 -04:00
Joey Hess
27fe59fd3c
followup 2019-02-07 16:06:10 -04:00
Joey Hess
0c70b146eb
response 2019-02-07 15:54:42 -04:00
Joey Hess
e20ae2555b
response 2019-02-07 15:29:02 -04:00
Joey Hess
dd50919980
response 2019-02-07 15:25:55 -04:00
Joey Hess
750f8ef189
comment 2019-02-07 15:22:01 -04:00
Joey Hess
d64e2ced70
response 2019-02-07 15:21:19 -04:00
Joey Hess
3ec003c45b
Merge branch 'master' of ssh://git-annex.branchable.com 2019-02-07 15:14:43 -04:00
Joey Hess
ef2010cd88
close 2019-02-07 15:14:09 -04:00
kirelagin@6d93475882c55a329fedae6be1971868a775ec7e
3a963b8d01 Added a comment 2019-02-07 19:03:36 +00:00
Joey Hess
83fdf443b5
Merge branch 'master' of ssh://git-annex.branchable.com 2019-02-07 14:39:19 -04:00
Joey Hess
07ccd932f8
followup 2019-02-07 14:06:21 -04:00
Joey Hess
60c1b5c994
deal with attempt to export filename with # or ? to webdav
xporting files with '#' or '?' in their name won't work because urls get
truncated on those. Fail in a better way in this case, and avoid failing
when removing such files from the export, so after the user has renamed the
problem files the export will succeed.
2019-02-07 13:47:57 -04:00
Joey Hess
d5c435d3dc
add 2019-02-07 12:16:23 -04:00
prabindh
37621db4f6 Added a comment: Windows build with stack 2019-02-07 14:59:52 +00:00
gueux
8153d2b265 2019-02-07 14:24:08 +00:00
gueux
b2fedc1a50 2019-02-07 14:22:18 +00:00
gueux
3e646eee4c 2019-02-07 14:20:38 +00:00
gueux
c598c5e7f6 Added a comment 2019-02-07 14:02:41 +00:00
gueux
cf32f5e7f9 2019-02-07 10:18:32 +00:00
ro
25b01ebde8 2019-02-07 00:50:39 +00:00
pellman.john@e59e5c6d98d49cd9632d6fbe0c5026ddc71d52fd
56a7d1dad8 Added a comment: Inconsistent idiom 2019-02-06 20:53:00 +00:00
anarcat
64326bd4c9 question about bandwidth optimization 2019-02-06 19:43:34 +00:00
anarcat
b2da3f2b8c sign 2019-02-06 19:11:24 +00:00
anarcat
f08c504fdb some weird issue i keep postponing to report 2019-02-06 19:04:10 +00:00
Joey Hess
c0b95fd969
update 2019-02-06 13:17:56 -04:00
Ilya_Shlyakhter
c33793f983 Added a comment 2019-02-05 20:55:59 +00:00
Joey Hess
011161902b
followup 2019-02-05 14:56:45 -04:00
Joey Hess
c3f47ba389
make .noannex file prevent repo fixups
Avoid performing repository fixups for submodules and git-worktrees
when there's a .noannex file that will prevent git-annex from being
used in the repository.

This change is ok as long as the .noannex file is really going to prevent
git-annex from being used. But, init --force could override the file.
Which would result in the repo being initialized without the fixups
having run.

To avoid that situation decided to change init, to not let --force be used
to override a .noannex file. Instead the user can just delete the file.
2019-02-05 14:43:23 -04:00
Joey Hess
8795fc6ba8
same 2019-02-05 14:05:59 -04:00
Joey Hess
b080699a95
fromkey --json
* fromkey: Added --json.
* fromkey --batch output changed to support using it with --json.
  The old output was not parseable for any useful information, so
  this is not expected to break anything.
2019-02-05 14:03:29 -04:00
Joey Hess
7b46b43c48
fromkey: Made idempotent
If the worktree file already exists, and is annexed and uses the same
key, avoid failing, nothing needs to be done.

Had to add lookupFileNotHidden to handle the case where an adjust --hide-missing
is in use, and the worktree file was hidden due to the object content
being missing. lookupFile would return the key of the hidden file,
but it makes sense that after fromkey succeeds, the worktree must
contain the file it was supposed to set up.
2019-02-05 13:13:13 -04:00