Commit graph

36441 commits

Author SHA1 Message Date
Joey Hess
c78b9b55b6
rename changeGitConfig to overrideGitConfig and avoid unncessary calls
It's important that it be clear that it overrides a config, such that
reloading the git config won't change it, and in particular, setConfig
won't change it.

Most of the calls to changeGitConfig were actually after setConfig,
which was redundant and unncessary. So removed those.

The only remaining one, besides --debug, is in the handling of
repository-global config values. That one's ok, because the
way mergeGitConfig is implemented, it does not override any value that
is set in git config. If a value with a repo-global setting was passed
to setConfig, it would set it in the git config, reload the git config,
re-apply mergeGitConfig, and use the newly set value, which is the right
thing.
2020-02-27 01:11:53 -04:00
Joey Hess
c089f395b0
Bugfix: Don't ignore --debug when it is followed by -c 2020-02-27 00:52:37 -04:00
Joey Hess
ba4a2d8734
formatting 2020-02-26 19:11:15 -04:00
Joey Hess
ad1b442430
add news item for git-annex 8.20200226 2020-02-26 19:10:09 -04:00
Joey Hess
8bc393a63b
releasing package git-annex version 8.20200226 2020-02-26 19:09:23 -04:00
Joey Hess
bfa015ae4e
Merge branch 'v7' 2020-02-26 18:49:36 -04:00
Joey Hess
1b23a18791
devblog 2020-02-26 18:49:07 -04:00
Joey Hess
f2a50a9944
version 2020-02-26 18:42:34 -04:00
Joey Hess
5b4ba5c6a5
add news item for git-annex 7.20200226 2020-02-26 18:40:45 -04:00
Joey Hess
09b5a77665
retitl 2020-02-26 18:39:09 -04:00
Joey Hess
ce8a034ecd
idea, not impementing today 2020-02-26 18:38:12 -04:00
Joey Hess
535ad3ba75
comment 2020-02-26 18:30:20 -04:00
Joey Hess
66e27f9ed7
Merge branch 'master' of ssh://git-annex.branchable.com 2020-02-26 18:30:08 -04:00
Joey Hess
64639ff9b1
followup and close 2020-02-26 18:29:06 -04:00
Joey Hess
4615c270c9
remove unused import
(cherry picked from commit 1f0fc9ff5f)
2020-02-26 18:17:56 -04:00
Joey Hess
81e3faf810
Merge branch 'v7' 2020-02-26 18:15:18 -04:00
Joey Hess
d37975357d
Bugfix: export --tracking (a deprecated option) set annex-annex-tracking-branch, instead of annex-tracking-branch.
(cherry picked from commit a3a674d15b)
2020-02-26 18:08:04 -04:00
Joey Hess
e535da621c
Bugfix to getting content from an export remote with -J, when the export database was not yet populated.
(cherry picked from commit e520341500)
2020-02-26 18:07:20 -04:00
Joey Hess
8af6d2c3c5
fix encryption of content to gcrypt and git-lfs
Fix serious regression in gcrypt and encrypted git-lfs remotes.
Since version 7.20200202.7, git-annex incorrectly stored content
on those remotes without encrypting it.

Problem was, Remote.Git enumerates all git remotes, including git-lfs
and gcrypt. It then dispatches to those. So, Remote.List used the
RemoteConfigParser from Remote.Git, instead of from git-lfs or gcrypt,
and that parser does not know about encryption fields, so did not
include them in the ParsedRemoteConfig. (Also didn't include other
fields specific to those remotes, perhaps chunking etc also didn't
get through.)

To fix, had to move RemoteConfig parsing down into the generate methods
of each remote, rather than doing it in Remote.List.

And a consequence of that was that ParsedRemoteConfig had to change to
include the RemoteConfig that got parsed, so that testremote can
generate a new remote based on an existing remote.

(I would have rather fixed this just inside Remote.Git, but that was not
practical, at least not w/o re-doing work that Remote.List already did.
Big ugly mostly mechanical patch seemed preferable to making git-annex
slower.)
2020-02-26 18:05:36 -04:00
yarikoptic
cef703ccb8 removed 2020-02-26 21:00:18 +00:00
yarikoptic
b49a0ca25a Added a comment 2020-02-26 20:58:16 +00:00
yarikoptic
34d726cba6 Added a comment: --debug output 2020-02-26 20:37:00 +00:00
yarikoptic
80b8b55b09 Added a comment: --debug output 2020-02-26 20:36:28 +00:00
yarikoptic
0651e88a56 Added a comment 2020-02-26 20:14:47 +00:00
yarikoptic
1df33a5b3b initial report on --debug , -c interaction 2020-02-26 19:59:48 +00:00
Joey Hess
fed72e0e8e
comment 2020-02-26 15:24:12 -04:00
basile.pinsard@f1a7fae9f3bd9d5282fca11f62ad53b45a8eb317
264c0c5780 Added a comment 2020-02-26 19:15:11 +00:00
basile.pinsard@f1a7fae9f3bd9d5282fca11f62ad53b45a8eb317
93517d7b70 Added a comment 2020-02-26 19:11:53 +00:00
Joey Hess
30979bcc4c
comment 2020-02-26 15:06:38 -04:00
Joey Hess
9050788b66
info: Fix display of the encryption value. (Some debugging junk had crept in.) 2020-02-26 15:02:23 -04:00
Joey Hess
e520341500
Bugfix to getting content from an export remote with -J, when the export database was not yet populated. 2020-02-26 14:57:29 -04:00
Joey Hess
cb86caf929
comment 2020-02-26 14:21:35 -04:00
Joey Hess
85d9a810e9
response 2020-02-26 14:08:11 -04:00
yarikoptic
c259aedab5 Added a comment 2020-02-26 17:42:51 +00:00
yarikoptic
f765f3a357 Added a comment: requires -c annex.retry=2 to workaround 2020-02-26 17:34:55 +00:00
basile.pinsard@f1a7fae9f3bd9d5282fca11f62ad53b45a8eb317
5d84564a76 removed 2020-02-26 16:39:22 +00:00
yarikoptic
720a7727a1 issue on a stalled enableremote 2020-02-26 16:20:44 +00:00
basile.pinsard@f1a7fae9f3bd9d5282fca11f62ad53b45a8eb317
3e3d72d803 Added a comment: strace 2020-02-26 15:51:10 +00:00
basile.pinsard@f1a7fae9f3bd9d5282fca11f62ad53b45a8eb317
6988256f68 Added a comment: strace 2020-02-26 15:50:50 +00:00
basile.pinsard@f1a7fae9f3bd9d5282fca11f62ad53b45a8eb317
26e7c935af Added a comment 2020-02-26 13:46:22 +00:00
bvaa
456bff66f8 2020-02-26 10:25:47 +00:00
Joey Hess
5de1abf3da
todo 2020-02-25 17:44:03 -04:00
Joey Hess
9dca87311a
comment 2020-02-25 16:39:07 -04:00
Joey Hess
3497e9e510
comment 2020-02-25 16:16:18 -04:00
Joey Hess
9659f1c30f
annex.security.allowed-ip-addresses ports syntax
Extended annex.security.allowed-ip-addresses to let specific ports of an IP
address to be used, while denying use of other ports.
2020-02-25 15:45:52 -04:00
Joey Hess
4316d92b48
comment 2020-02-25 14:38:55 -04:00
Joey Hess
83f45cbe8e
clarify that the listed IP addresses are in addition to the ones normally allowed 2020-02-25 14:34:39 -04:00
Joey Hess
288e07a416
comment 2020-02-25 13:46:51 -04:00
Joey Hess
b4c4e3b853
correction 2020-02-25 13:42:44 -04:00
Joey Hess
7b8ec5023e
comment 2020-02-25 13:41:42 -04:00