Commit graph

36283 commits

Author SHA1 Message Date
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
Joey Hess
cd8a208b8c
releasing package git-annex version 7.20200219 2020-02-19 12:45:30 -04:00
Joey Hess
a5ce518e7d
Merge branch 'master' of ssh://git-annex.branchable.com 2020-02-19 12:38:37 -04:00
Joey Hess
72959b23e5
remove mention of receive.denyNonFastforwards on push failure
That was added back in 2013 commit 2af652e1b8
and I'm a bit unclear about the reasons.

It seemed that, at the time, receive.denyNonFastforwards=true, which is
the default in a repo created by git init --shared --bare (but not
without --shared), which the assistant did, caused problems syncing.
But even at the time the bug report showed an error message clearly
explaining that it was a non-fast-forward push being denied.

I tried it with the current version, and since git-annex sync pulls
from the bare repo and merges, it pushes a fast-forward. So there's no
failure to push. (There could be one if another push happened after the
pull, but you'd want it to fail then presumably.)

I'm not 100% sure what changed to make it not be a problem, but I know
I've seen this message in many circumstances and I can't ever recall it
having anything to do with any issue that prevented a push.

Based on doc/forum/non_fast_forward_error_with_git_annex_sync.mdwn,
which showed the problem when syncing from a direct mode repo,
and on doc/forum/receiving_indirect_renames_on_direct_repo___63__/comment_3_0246fff6c7c75f6be45bd257ec3872a5._comment
which seems to show the problem was actually a problem pulling,
I think there's a good chance that the problem actually involved direct
mode.
2020-02-19 11:46:24 -04:00
Dan
ad6cc2178a Added a comment: Avoid fetching from special remotes 2020-02-19 00:22:06 +00:00
Ilya_Shlyakhter
0ae1a3335e Added a comment: thanks 2020-02-18 20:00:17 +00:00
Ilya_Shlyakhter
af91e5e5e7 Added a comment: git-annex build-time dependencies 2020-02-18 19:33:35 +00:00
Joey Hess
c4a1b04e8b
comment 2020-02-18 12:51:59 -04:00
Joey Hess
f1a1669224
clarify description of synced/ branches 2020-02-18 12:42:44 -04:00
Joey Hess
06f6eb7a70
--only-annex --no-content combination 2020-02-18 12:29:31 -04:00
Nick_P
cc4521068c Added a comment 2020-02-18 10:17:29 +00:00
Nick_P
27cf7424f2 Added a comment 2020-02-18 10:15:14 +00:00
Dan
216c2154ec Added a comment: An overdue and overlong reply 2020-02-17 22:59:22 +00:00
Joey Hess
a78eb6dd58
sync --only-annex and annex.synconlyannex
* Added sync --only-annex, which syncs the git-annex branch and annexed
  content but leaves managing the other git branches up to you.
* Added annex.synconlyannex git config setting, which can also be set with
  git-annex config to configure sync in all clones of the repo.

Use case is then the user has their own git workflow, and wants to use
git-annex without disrupting that, so they sync --only-annex to get the
git-annex stuff in sync in addition to their usual git workflow.

When annex.synconlyannex is set, --not-only-annex can be used to override
it.

It's not entirely clear what --only-annex --commit or --only-annex
--push should do, and I left that combination not documented because I
don't know if I might want to change the current behavior, which is that
such options do not override the --only-annex. My gut feeling is that
there is no good reasons to use such combinations; if you want to use
your own git workflow, you'll be doing your own committing and pulling
and pushing.

A subtle question is, how should import/export special remotes be handled?
Importing updates their remote tracking branch and merges it into master.
If --only-annex prevented that git branch stuff, then it would prevent
exporting to the special remote, in the case where it has changes that
were not imported yet, because there would be a unresolved conflict.

I decided that it's best to treat the fact that there's a remote tracking
branch for import/export as an implementation detail in this case. The more
important thing is that an import/export special remote is entirely annexed
content, and so it makes a lot of sense that --only-annex will still sync
with it.
2020-02-17 16:33:10 -04:00
Joey Hess
ae4177d456
fix warning 2020-02-17 15:06:28 -04:00
Dan
1c387175eb Added a comment: Thanks 2020-02-17 17:52:22 +00:00
Joey Hess
96eb008910
comment 2020-02-17 13:42:21 -04:00
Joey Hess
9c94bd138f
comment 2020-02-17 13:11:01 -04:00
Joey Hess
87356a8f32
response 2020-02-17 13:04:18 -04:00
Joey Hess
39864fe1b4
close wontfix 2020-02-17 12:53:27 -04:00
Joey Hess
f4bf2ccc7a
comment 2020-02-17 12:45:00 -04:00
Joey Hess
f3682e50e5
response 2020-02-17 12:29:18 -04:00
Joey Hess
d04e6aac6c
comment 2020-02-17 12:26:09 -04:00
Joey Hess
d2e0996c04
comment 2020-02-17 12:04:54 -04:00
Joey Hess
ef3e203436
comment 2020-02-17 11:56:08 -04:00
Joey Hess
03932a31bd
Merge branch 'master' of ssh://git-annex.branchable.com 2020-02-16 11:40:32 -04:00
Ilya_Shlyakhter
ae75b673cf Added a comment 2020-02-16 04:05:11 +00:00
yarikoptic
3d4f068796 Added a comment 2020-02-15 04:45:05 +00:00
Joey Hess
da9945c013
silence build warning 2020-02-14 19:38:50 -04:00
Ilya_Shlyakhter
703a88a58e Added a comment: ssh caching 2020-02-14 20:53:30 +00:00
giuly.ippoliti@c1e2f0d5e40b128900f94f3d107d3719f87c3ff7
993c9e98f2 Added a comment: Disable git annex logs 2020-02-14 19:39:30 +00:00
Joey Hess
879f52a116
annex.tune.branchhash1=true bugfix
Fix support for repositories tuned with annex.tune.branchhash1=true,
including --all not working and git-annex log not displaying anything for
annexed files.
2020-02-14 15:22:48 -04:00
Joey Hess
c265cf27a0
tag moreinfo 2020-02-14 14:53:39 -04:00
Joey Hess
352963690a
fsck --from remote -J concurrency bug
fsck --from remote: Fix a concurrency bug that could make it incorrectly
detect that content in the remote is corrupt, and remove it, resulting in
data loss.
2020-02-14 14:52:15 -04:00
Joey Hess
399319ccbc
Avoid throwing fatal errors when asked to write to a readonly git remote on http
Test suite found one of them, looking for giveup turned up several more.
2020-02-14 14:38:13 -04:00
Joey Hess
a490947068
annex.sshcaching warning improvement and allow overridding build time default
* When git-annex is built with a ssh that does not support ssh connection
  caching, default annex.sshcaching to false, but let the user override it.
* Improve warning messages further when ssh connection caching cannot
  be used, to clearly state why.
2020-02-14 14:21:03 -04:00
Joey Hess
8397f585f5
Merge branch 'master' of ssh://git-annex.branchable.com 2020-02-14 13:47:08 -04:00
yarikoptic
0af85edb58 Added a comment 2020-02-14 17:20:29 +00:00
yarikoptic
8214da5715 Initial TODO on making --whatelse machine readable 2020-02-14 17:18:37 +00:00
jochen.keil@38b1f86ab65128dab3e62e726403ceee4f5141bf
3868a2fef1 Added a comment 2020-02-14 12:04:54 +00:00
Dan
1b69ee5d4b removed 2020-02-14 01:23:50 +00:00
Dan
fbc2011404 Added a comment: Editing Comments? 2020-02-14 01:23:13 +00:00
Dan
84c9017862 Added a comment: Editing Comments? 2020-02-14 01:22:50 +00:00
Dan
6d82045149 Added a comment: Still wanted (update with example) 2020-02-13 20:08:48 +00:00
lykos@d125a37d89b1cfac20829f12911656c40cb70018
16171f8c5c Added a comment 2020-02-13 12:29:43 +00:00
jochen.keil@38b1f86ab65128dab3e62e726403ceee4f5141bf
dec1c65f5a 2020-02-13 11:39:02 +00:00
Ilya_Shlyakhter
eb6527197f added bug report re: warning about ssh caching keeps showing 2020-02-12 18:12:10 +00:00
Nick_P
a0f39a0412 Added a comment 2020-02-12 10:50:09 +00:00
cnjr2
58ebe5fc28 Added a comment 2020-02-12 10:37:27 +00:00
Joey Hess
933cb573df
Merge branch 'master' of ssh://git-annex.branchable.com 2020-02-10 16:03:48 -08:00