Merge branch 'master' of ssh://git-annex.branchable.com

This commit is contained in:
Joey Hess 2024-11-12 14:34:05 -04:00
commit fa3e4d0c64
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
3 changed files with 131 additions and 0 deletions

View file

@ -0,0 +1,47 @@
### Please describe the problem.
When using `git annex sync -C` / `git annex sync --content-of`, there is no suggestion of a path that is required by this argument.
### What steps will reproduce the problem?
Type in `git annex sync -C` and hit <TAB>
### What version of git-annex are you using? On what operating system?
git-annex:
```shell
git-annex version: 10.20240129
build flags: Assistant Webapp Pairing Inotify DBus DesktopNotify TorrentParser MagicMime Benchmark Feeds Testsuite S3 WebDAV
dependency versions: aws-0.24.1 bloomfilter-2.0.1.2 crypton-0.33 DAV-1.3.4 feed-1.3.2.1 ghc-9.4.7 http-client-0.7.14 persistent-sqlite-2.13.2.0 torrent-10000.1.3 uuid-1.3.15 yesod-1.6.2.1
key/value backends: SHA256E SHA256 SHA512E SHA512 SHA224E SHA224 SHA384E SHA384 SHA3_256E SHA3_256 SHA3_512E SHA3_512 SHA3_224E SHA3_224 SHA3_384E SHA3_384 SKEIN256E SKEIN256 SKEIN512E SKEIN512 BLAKE2B256E BLAKE2B256 BLAKE2B512E BLAKE2B512 BLAKE2B160E BLAKE2B160 BLAKE2B224E BLAKE2B224 BLAKE2B384E BLAKE2B384 BLAKE2BP512E BLAKE2BP512 BLAKE2S256E BLAKE2S256 BLAKE2S160E BLAKE2S160 BLAKE2S224E BLAKE2S224 BLAKE2SP256E BLAKE2SP256 BLAKE2SP224E BLAKE2SP224 SHA1E SHA1 MD5E MD5 WORM URL X*
remote types: git gcrypt p2p S3 bup directory rsync web bittorrent webdav adb tahoe glacier ddar git-lfs httpalso borg hook external
operating system: linux x86_64
supported repository versions: 8 9 10
upgrade supported from repository versions: 0 1 2 3 4 5 6 7 8 9 10
local repository version: 10
```
OS:
```shell
Distributor ID: Ubuntu
Description: Ubuntu 24.04.1 LTS
Release: 24.04
Codename: noble
```
Shell:
```shell
zsh 5.9 (x86_64-ubuntu-linux-gnu)
```
(no plugins, no oh-my-zsh or else, just plain old zsh)
### Have you had any luck using git-annex before? (Sometimes we get tired of reading bug reports all day and a lil' positive end note does wonders)
Everything else is working fine, so far :-)

View file

@ -0,0 +1,70 @@
[[!comment format=mdwn
username="yarikoptic"
avatar="http://cdn.libravatar.org/avatar/f11e9c84cb18d26a1748c33b48c924b4"
subject="comment 2"
date="2024-11-11T22:11:13Z"
content="""
nope -- I do not see any traces of such configuration anywhere
```
yoh@typhon:~/proj/dandi/s5cmd-dandi$ git status
HEAD detached from 9f3a363
Untracked files:
(use \"git add <file>...\" to include in what will be committed)
.duct/logs/2024.10.30T14.59.27-418623_info.json
.duct/logs/2024.10.30T14.59.27-418623_stderr
.duct/logs/2024.10.30T14.59.27-418623_stdout
.duct/logs/2024.10.30T14.59.27-418623_usage.json
.duct/logs/2024.11.04T12.31.25-2144989_info.json
.duct/logs/2024.11.04T12.31.25-2144989_stderr
.duct/logs/2024.11.04T12.31.25-2144989_stdout
.duct/logs/2024.11.04T12.31.25-2144989_usage.json
nothing added to commit but untracked files present (use \"git add\" to track)
yoh@typhon:~/proj/dandi/s5cmd-dandi$ ls -ld .duct/logs/2024.10.30T14.59.27-418623_stdout
-rw-r--r-- 1 yoh yoh 54902635452 Nov 2 05:43 .duct/logs/2024.10.30T14.59.27-418623_stdout
yoh@typhon:~/proj/dandi/s5cmd-dandi$ cat .gitattributes
* annex.backend=MD5E
**/.git* annex.largefiles=nothing
yoh@typhon:~/proj/dandi/s5cmd-dandi$ git annex config --get annex.largefiles
yoh@typhon:~/proj/dandi/s5cmd-dandi$ git config --get annex.largefiles
yoh@typhon:~/proj/dandi/s5cmd-dandi$ cat .git/config
[core]
repositoryformatversion = 0
filemode = true
bare = false
logallrefupdates = true
[remote \"origin\"]
url = https://github.com/dandi/s5cmd-dandi
fetch = +refs/heads/*:refs/remotes/origin/*
annex-ignore = true
[branch \"master\"]
remote = origin
merge = refs/heads/master
[annex]
uuid = d80bb1cb-d07b-45b7-bdb1-b4a3f0bf4131
version = 10
[filter \"annex\"]
smudge = git-annex smudge -- %f
clean = git-annex smudge --clean -- %f
process = git-annex filter-process
yoh@typhon:~/proj/dandi/s5cmd-dandi$ git check-attr annex.largefiles .duct/logs/2024.11.04T12.31.25-2144989_stdout
.duct/logs/2024.11.04T12.31.25-2144989_stdout: annex.largefiles: unspecified
yoh@typhon:~/proj/dandi/s5cmd-dandi$ git annex add .duct/logs/2024.11.04T12.31.25-2144989_stdout
add .duct/logs/2024.11.04T12.31.25-2144989_stdout (non-large file; adding content to git repository) ok
(recording state in git...)
fatal: Unable to create '/home/yoh/proj/dandi/s5cmd-dandi/.git/index.lock': File exists.
Another git process seems to be running in this repository, e.g.
an editor opened by 'git commit'. Please make sure all processes
are terminated then try again. If it still fails, a git process
may have crashed in this repository earlier:
remove the file manually to continue.
yoh@typhon:~/proj/dandi/s5cmd-dandi$ fuser -v /home/yoh/proj/dandi/s5cmd-dandi/.git/index.lock
yoh@typhon:~/proj/dandi/s5cmd-dandi$ ls -ld /home/yoh/proj/dandi/s5cmd-dandi/.git/index.lock
-rw-r--r-- 1 yoh yoh 0 Nov 7 10:47 /home/yoh/proj/dandi/s5cmd-dandi/.git/index.lock
yoh@typhon:~/proj/dandi/s5cmd-dandi$ git annex version --raw
10.20241031-1~ndall+1
```
"""]]

View file

@ -0,0 +1,14 @@
[[!comment format=mdwn
username="yarikoptic"
avatar="http://cdn.libravatar.org/avatar/f11e9c84cb18d26a1748c33b48c924b4"
subject="comment 3"
date="2024-11-11T22:18:37Z"
content="""
Thank you Joey!
> Except for the web special remote, which is a special case. I guess yours special remote also may be a special case, ...
or in the other words, \"not that special\" after all. I see it just a common enough pattern for use of this new `reregisterurl` that in my case it would be easier to just add an option instead of chaining manually `reregisterurl`, figure out what key one way or another, call `setpresentkey` with `0`. After all it is for a user to announce one way or another.
Anyways, I am ok for now, hopefully would not forget next time I use it to chase with that extra invocation.
"""]]