Commit graph

39290 commits

Author SHA1 Message Date
Joey Hess
8a097fcb96
fix sequence 2021-03-11 12:30:02 -04:00
Joey Hess
df8f849354
Merge branch 'master' of ssh://git-annex.branchable.com 2021-03-11 12:29:27 -04:00
Joey Hess
4df9495d56
comment 2021-03-11 12:28:25 -04:00
Joey Hess
06f86379b0
todo from comment 2021-03-11 12:26:10 -04:00
Joey Hess
4fc5dbc942
update comment 2021-03-11 12:03:36 -04:00
meribold
a637b8eb6b Added a comment 2021-03-11 02:52:34 +00:00
jwrauch
a3a6f0f424 2021-03-10 21:25:59 +00:00
Joey Hess
33481fef7a
add news item for git-annex 8.20210310 2021-03-10 13:59:42 -04:00
Joey Hess
a343ea76c8
releasing package git-annex version 8.20210310 2021-03-10 13:59:00 -04:00
Joey Hess
3bf789c68f
git on OSX dmg updated to fix CVE
This mostly affects OSX and (possibly) Windows, but the Windows
installer does not bundle git. The linux standalone builds are not
updated yet pending debian stable getting a backport of the security
fix, but the security hole is unlikely to affect linux as
case-insensitive filesystems that support symlinks are a rarity on it.
Using the linux standalone build on windows via WSL is another way it
could be affected.

This commit was sponsored by Brett Eisenberg on Patreon.
2021-03-10 13:53:11 -04:00
Joey Hess
60be1a7864
reorder 2021-03-10 10:15:45 -04:00
Joey Hess
f951847c6a
improve 2021-03-09 15:59:29 -04:00
Joey Hess
1d7fa63149
Added support for git-remote-gcrypt's rsync URIs
Which access a remote using rsync over ssh, and which git pushes to much
more efficiently than ssh urls.

There was some old partial support for rsync URIs from 2013, but it seemed
incomplete, and did not use rsync over ssh. Weird.

I'm not sure if there's any remaining benefit to using the non-rsync url
forms with gcrypt, now that this is implemented? Updated docs to encourage
using the rsync urls.

This commit was sponsored by Svenne Krap on Patreon.
2021-03-09 15:58:09 -04:00
Joey Hess
15891441f1
close 2021-03-09 14:00:11 -04:00
Joey Hess
1facddbfae
close long-fixed bug 2021-03-09 13:58:22 -04:00
Joey Hess
1e89560f5c
clarify 2021-03-09 13:56:31 -04:00
Joey Hess
e07eabbf7f
Fix support for local gcrypt repositories with a space in their URI
Git.Remote.parseRemoteLocation had a hack to handle URIs that contained
characters like spaces, which is something git unfortunately allows
despite not being a valid URI. However, that hack looked for "//" to
guess something was an URI, and these gcrypt URIs, being to a local
path, don't contain that. So instead escape all illegal characters and
check if the resulting thing is an URI.

And that was already done by Git.Construct.fromUrl, so
internally the gcrypt URI with a space looks like "gcrypt::foo%20bar"
and that needs to be de-escaped when converting back from URI to local
repo path.

This change might also allow a few other almost-valid URIs to be handled
as URIs by git-annex. None that contain "//" will change, and any
behavior change should result in git-annex doing closer to a right thing
than it did before, probably.

This commit was sponsored by Noam Kremen on Patreon.
2021-03-09 12:49:51 -04:00
Joey Hess
d3578f3b66
close as dup 2021-03-09 11:48:41 -04:00
Joey Hess
e57c5b92f9
Merge branch 'master' of ssh://git-annex.branchable.com 2021-03-09 11:45:24 -04:00
tomdhunt
3639ce1a99 2021-03-08 19:07:19 +00:00
Joey Hess
b05f8458fb
remove tag 2021-03-08 14:47:40 -04:00
tomdhunt
55f7eae066 2021-03-08 18:40:10 +00:00
Joey Hess
2f5e1ae7a9
comment 2021-03-08 12:51:19 -04:00
Joey Hess
4bbda63d8c
Merge branch 'master' of ssh://git-annex.branchable.com 2021-03-08 12:46:53 -04:00
Ilya_Shlyakhter
6e62ed17d9 Added a comment: Re: "Any way to delete a remote?" 2021-03-08 15:13:39 +00:00
tomdhunt
3aa5acf556 Added a comment 2021-03-08 03:28:49 +00:00
Ilya_Shlyakhter
eccdf47e6f Added a comment 2021-03-07 13:38:56 +00:00
tomdhunt
139fac8c49 Added a comment: Any way to delete a remote? 2021-03-07 01:53:25 +00:00
Joey Hess
6940d4ad40
chance case of "transfer failed" to match "Transfer stalled" 2021-03-06 17:47:05 -04:00
qiang.fang@ddaed0de00c2925f8036e6c61ce6e12654263ada
7ce80263ef Added a comment 2021-03-06 00:03:52 +00:00
Joey Hess
e8065ee99d
close todo 2021-03-05 14:46:09 -04:00
Joey Hess
cdd512cd9f
simplify 2021-03-05 14:22:04 -04:00
Joey Hess
1b041f5c51
avoid logging location of GIT keys
It's not necessary to log location of GIT keys, because these files are
not annexed files and so git-annex will never need to get them.

This corresponds to code in Annex.Import that already checked before
updating the location log when handling deleted files.

Older versions of git-annex that used SHA1 keys for non-annexed files
also unncessarily updated the location log for them.

GIT keys still appear in the git-annex branch for content identifier
logs, so kept the documentation of them in backends.mdwn

This commit was sponsored by Jake Vosloo on Patreon.
2021-03-05 14:12:34 -04:00
Joey Hess
fc61915230
use GIT keys for export of non-annexed files
This solves the problem that import of such files gets confused and
converts them back to annexed files.

The import code already used GIT keys internally when it determined a
file should not be annexed. So now when it sees a GIT key that export
used, it already does the right thing.

This also means that even older version of git-annex can import and will
do the right thing, once a fixed version has exported. Still, there may
be other complications around upgrades; still need to think it all
through.

Moved gitShaKey and keyGitSha from Key to Annex.Export since they're
only used for export/import.

Documented GIT keys in backends, since they do appear in the git-annex
branch now.

This commit was sponsored by Graham Spencer on Patreon.
2021-03-05 14:12:11 -04:00
Joey Hess
deac6f12b5
forgot to add this comment earlier 2021-03-05 12:40:39 -04:00
Joey Hess
8d983b6432
comment 2021-03-05 12:39:57 -04:00
Joey Hess
11048bee03
comment 2021-03-05 12:20:54 -04:00
branchable@bafd175a4b99afd6ed72501042e364ebd3e0c45e
346984aa42 2021-03-05 14:07:09 +00:00
gerta
a36b8def30 2021-03-03 13:12:29 +00:00
vrinek@ebb1af586fdc413fc8081c073e5ae591a619cbe2
16b3e5754d Fix borg create example (according to https://borgbackup.readthedocs.io/en/stable/usage/create.html#examples) 2021-03-02 21:58:31 +00:00
kyle
324f2c06c5 Added a comment: thanks 2021-03-02 20:51:53 +00:00
Joey Hess
1e46158c44
Merge branch 'master' of ssh://git-annex.branchable.com 2021-03-02 13:48:02 -04:00
Joey Hess
a14001785e
fix --branch combined with --unlocked or --locked
Since it's using git ls-tree anyway, can just look at the file modes to see
if they're unlocked or are symlinks.
2021-03-02 13:47:27 -04:00
Joey Hess
cbf94fd13d
prep for fixing find --branch --unlocked
Added LinkType to ProvidedInfo, and unified MatchingKey with
ProvidedInfo. They're both used in the same way, so there was no real
reason to keep separate.

Note that addLocked and addUnlocked still set matchNeedsFileName,
because to handle MatchingFile, they do need it. However, they
don't use it when MatchingInfo is provided. This should be ok,
the --branch case will be able skip checking matchNeedsFileName,
since it will provide a filename in any case.
2021-03-02 13:39:31 -04:00
gerta
3d48e96972 2021-03-02 08:04:22 +00:00
Joey Hess
ee4fd38ecf
remove unused contentFile = Nothing 2021-03-01 16:35:38 -04:00
Joey Hess
25e4ab7e81
Prevent combinations of options such as --all with --include
Previously such nonsensical combinations always treated the matching option
as if it didn't match.

For now, made find --branch refuse matching options that need a
filename, because one is not provided to them in a way they'll use.
There's an open bug report to support it, but making it error out is
better than the old behavior of not finding what it was asked to.

Also, made --mimetype combined with eg --all work, by looking at the
object file when operating on keys.
2021-03-01 16:25:23 -04:00
Joey Hess
7a089f05b2
move comment to correct bug 2021-03-01 15:24:21 -04:00
Joey Hess
eb594c710e
unregisterurl: New command
Implemented by generalizing registerurl. Without the implicit batch mode
of registerurl since that is only a backwards compatability thing
(see commit 1d1054faa6).
2021-03-01 14:28:24 -04:00
Joey Hess
97ae474585
registerurl: Allow it to be used in a bare repository. 2021-03-01 14:03:03 -04:00