Commit graph

43083 commits

Author SHA1 Message Date
Joey Hess
16f1e24665
revert recent bug fix temporarily for release
Decided this bug is not severe enough to delay the release until
tomorrow, so this will be re-applied after the release.
2023-02-14 14:06:29 -04:00
Joey Hess
c1ef4a7481
Avoid Git.Config.updateLocation adding "/.git" to the end of the repo
path to a bare repo when git config is not allowed to list the configs
due to the CVE-2022-24765 fix.

That resulted in a confusing error message, and prevented the nice
message that explains how to mark the repo as safe to use.

Made isBare a tristate so that the case where core.bare is not returned can
be handled.

The handling in updateLocation is to check if the directory
contains config and objects and if so assume it's bare.
Note that if that heuristic is somehow wrong, it would construct a repo
that thinks it's bare but is not. That could cause follow-on problems,
but since git-annex then checks checkRepoConfigInaccessible, and skips
using the repo anyway, a wrong guess should not be a problem.

Sponsored-by: Luke Shumaker on Patreon
2023-02-14 14:00:36 -04:00
Joey Hess
12b45d3b89
use isBareRepo
The advantage over Git.Config.isBare is that it avoids a string
comparison and a map lookup.

Sponsored-by: Noam Kremen on Patreon
2023-02-14 13:52:05 -04:00
Joey Hess
8077fc9ce7
analysis 2023-02-14 13:31:26 -04:00
Joey Hess
c1f4d536b2
fix comment 2023-02-14 13:28:02 -04:00
Joey Hess
e44716f277
upper case start of warning 2023-02-14 12:34:46 -04:00
Joey Hess
7c69f3a75a
add space after colon in warning message 2023-02-14 12:34:07 -04:00
Joey Hess
4ed539dd40
bug report from forum 2023-02-14 12:30:58 -04:00
Joey Hess
2b73662291
comment 2023-02-14 12:18:00 -04:00
nobodyinperson
2e80d964de Added a comment: 👍 This made it easier for the Thunar plugin! 2023-02-14 09:35:32 +00:00
sb-beryllium@6e2c477eac63b823bd315ef8aaf5f93173c1f15b
e970c4eb99 Added a comment: Resolved 2023-02-13 22:46:48 +00:00
Joey Hess
452b080dba
better handling of multiple repositories with the same name
Used to fail with a bad error message, indicating there was no
repository with the specified name, or something like that. Now, suggest
they use the uuid to disambiguate.

* info, enableremotemote, renameremote: Avoid a confusing message when more
  than one repository matches the user provided name.
* info: Exit nonzero when the input is not supported.

Sponsored-by: Kevin Mueller on Patreon
2023-02-13 14:31:09 -04:00
Joey Hess
826b225ca8
Sped up view branch construction by 50%
A benchmark in my sound repository with `git-annex view feedtitle=*`
took 2:52 wall clock time before and 1:58 after. Though it still only used
130% of CPU.

This is the same kind of optimisation that is in seekFilteredKeys, though
that precaches location logs while this streams the metadata logs direct
to parsing them.

seekFilteredKeys contains more streaming, to find the annexed files, and
this could be further sped up with similar streaming.

Sponsored-by: Nicholas Golder-Manning on Patreon
2023-02-13 13:29:57 -04:00
sb-beryllium@6e2c477eac63b823bd315ef8aaf5f93173c1f15b
c733ccdf21 Added a comment 2023-02-13 08:33:57 +00:00
nobodyinperson
d60d76a25a Added a comment: Have a look at mount options 2023-02-13 08:32:24 +00:00
sb-beryllium@6e2c477eac63b823bd315ef8aaf5f93173c1f15b
e75d1d9255 Added a comment 2023-02-13 00:46:46 +00:00
nadir
f06e405068 2023-02-12 14:13:34 +00:00
sb-beryllium@6e2c477eac63b823bd315ef8aaf5f93173c1f15b
2d8507e1d6 Added a comment 2023-02-12 11:28:07 +00:00
sb-beryllium@6e2c477eac63b823bd315ef8aaf5f93173c1f15b
7d5b589696 2023-02-12 10:39:01 +00:00
Joey Hess
33d7ed8b5c
move a paragraph into the pages that the links it talks about were long ago moved to 2023-02-11 16:07:05 -04:00
Joey Hess
d760644104
Merge branch 'master' of ssh://git-annex.branchable.com 2023-02-11 15:21:07 -04:00
Joey Hess
5b504b78d9
add warning about Go's past and future data collection
Based on https://github.com/golang/go/discussions/58409, the Go compiler
already defaults to using a google proxy server, which would allow
Google to collect information about what dependencies users are
installing. (Of course they claim they won't.) Two separate environment
settings are needed to turn that off, and users in that thread were
surprised to learn about one of them.

So this warning is already appropriate to some extent.

Also based on the minimisation of user concerns by the golang developers
on that issue and elsewhere, it seems best to assume that they are not
going to be dissuaded from increasing data collection efforts in the future,
even if the blowback prevents this particular attempt.

So this warning should not be removed unless the Go community somehow
extricates itself from Google's control. Or unless ipfs is rewritten in
another language.

Some distros do have ipfs. Unfortunately, Debian appears to be structurally
incapable of packaging it. (8 years and counting;
https://bugs.debian.org/779893). So lots of users will be stuck
installing it from source or having to trust its official binaries.
2023-02-11 15:17:31 -04:00
Joey Hess
6889fe5325
add a warning about homebrew's use of analytics by default
It apparently displays a notice on first use, but I was surprised to
learn about this behavior today, and I've used it. Displaying a notice
does not make violating users' privacy acceptable.
2023-02-11 15:08:31 -04:00
Joey Hess
4c4bc6ab1e
remove warning about ipfs being alpha code
That may have been true in 2015, but seems very unlikely
to be true now.
2023-02-11 14:13:18 -04:00
Atemu
401e000a0d 2023-02-10 23:05:04 +00:00
Joey Hess
551d5abeb5
close todo and open new one 2023-02-10 15:51:38 -04:00
Joey Hess
e9b6efac5a
fix buggy sync to exporttree remote when annex-tracking-branch is not checked out
sync: Fix a bug that caused files to be removed from an importtree=yes
exporttree=yes special remote when the remote's annex-tracking-branch was
not the currently checked out branch.

Sponsored-by: Max Thoursie on Patreon
2023-02-10 15:49:15 -04:00
Joey Hess
5c6e1f5178
bug report 2023-02-10 15:32:09 -04:00
Joey Hess
c2b3e870df
finishing up sync in view branch
sync: When run in a view branch, avoid updating synced/ branches, or trying
to merge anything from remotes.

Sponsored-by: Erik Bjäreholt on Patreon
2023-02-10 15:27:42 -04:00
Joey Hess
9e59ebea52
comment 2023-02-10 14:42:14 -04:00
Joey Hess
bb4550c7c1
sync: Warn when the adjusted basis ref cannot be found
As happens eg when the user has renamed branches.

Sponsored-by: Graham Spencer on Patreon
2023-02-10 14:33:21 -04:00
Joey Hess
fb93fbc564
comment 2023-02-10 14:16:23 -04:00
Joey Hess
b6466ffaca
comment 2023-02-10 14:06:34 -04:00
Joey Hess
7473dc6d3a
Merge branch 'master' of ssh://git-annex.branchable.com 2023-02-10 13:34:59 -04:00
Joey Hess
96d46db2d5
Support http urls that contain ":" that is not followed by a port number
The same as git does.

Sponsored-by: Dartmouth College's DANDI project
2023-02-10 13:34:47 -04:00
a@92214b2eae95307f511e06845d2cb5b5931b00a3
a497d73b93 2023-02-10 17:08:32 +00:00
jpds
8fa3264f3a 2023-02-10 15:10:17 +00:00
jpds
d696dc5bf5 2023-02-10 14:53:11 +00:00
yarikoptic
8847adacb2 initial report on http urls without port number 2023-02-10 14:16:53 +00:00
rshalaev@3e2130a1e3cb0aaff7dd80aba7548ad9be0ea2d4
e2c5820017 Added a comment 2023-02-09 14:22:19 +00:00
rshalaev@3e2130a1e3cb0aaff7dd80aba7548ad9be0ea2d4
98cd2e0c49 2023-02-09 10:23:12 +00:00
jpds
95c1e0e805 Added a comment 2023-02-09 09:51:21 +00:00
nobodyinperson
11b250352c Added a comment: long filenames in view 2023-02-08 22:11:30 +00:00
nobodyinperson
6e7e9813ee Added a comment: git annex sync when in view 2023-02-08 20:17:12 +00:00
Joey Hess
5f9bf51438
sync in view branch updates the view branch
* sync: When run in a view branch, refresh the view branch to reflect any
    changes that have been made to the parent branch or metadata.

This is basically working, but probably needs some more work to deal with
all the edge cases of things sync does.

Sponsored-by: Lawrence Brogan on Patreon
2023-02-08 15:37:28 -04:00
Joey Hess
a11d6e0baf
avoid sync pushing view branches to remotes, and better view branch names
* sync: Avoid pushing view branches to remotes.
* Changed the name of view branches to include the parent branch.
  Existing view branches checked out using an old name will still work.

It does not seem useful for sync to push view branches around, because
the information in a view branch can entirely be derived from other
information in git. And sync doesn't push adjusted branches around either.

The better view branch names make it more in line with adjusted branch
names, but were also needed to make fromViewBranch be able to return the
original branch name.

Kept the old view branch names still working. But, when those branches
exist in a repo, sync will still try to push them as before. Avoiding
that would need more complicated and/or expensive changes to sync.

Sponsored-By: Boyd Stephen Smith Jr. on Patreon
2023-02-08 13:57:48 -04:00
Joey Hess
b9d59cf721
document sync in adjusted branch behavior
This was documented in the git-annex-adjust man page, but not in
git-annex-sync
2023-02-08 12:48:31 -04:00
Joey Hess
dcaea65e39
comment 2023-02-08 12:41:54 -04:00
Joey Hess
21e8d201f3
link to related todo 2023-02-08 12:35:29 -04:00
Joey Hess
6f59d2e8eb
comment 2023-02-08 12:24:35 -04:00