mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

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

Browse source
This commit is contained in:
Joey Hess 2025-01-07 13:21:49 -04:00
commit 8bc88945e9
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
9 changed files with 301 additions and 78 deletions
Download patch file Download diff file Expand all files Collapse all files

45
doc/bugs/__40__site__47__server__41___main_repository_offline_2025-01-07.mdwn Normal file
View file

@ -0,0 +1,45 @@
### Please describe the problem.
The main repository `git://git-annex.branchable.com/` seems to be offline at the moment.
The mirror `git://git.joeyh.name/git-annex` seems to work.
### What steps will reproduce the problem?
A git clone of the main repo gives an error message "fatal: Could not read from remote repository.".
### What version of git-annex are you using? On what operating system?
.
### Please provide any additional information below.
[[!format sh """
# If you can, paste a complete transcript of the problem occurring here.
# If the problem is with the git-annex assistant, paste in .git/annex/daemon.log
C:\Users\jkniiv\Projektit\git-annex.branchable.com> git clone git://git-annex.branchable.com/ git-annex-clone-TEST
Cloning into 'git-annex-clone-TEST'...
fatal: Could not read from remote repository.
Please make sure you have the correct access rights
and the repository exists.
C:\Users\jkniiv\Projektit\git-annex.branchable.com> ping git-annex.branchable.com
Pinging git-annex.branchable.com [2600:3c03::f03c:91ff:fedf:c0e5] with 32 bytes of data:
Reply from 2600:3c03::f03c:91ff:fedf:c0e5: time=126ms
Reply from 2600:3c03::f03c:91ff:fedf:c0e5: time=116ms
Reply from 2600:3c03::f03c:91ff:fedf:c0e5: time=118ms
Reply from 2600:3c03::f03c:91ff:fedf:c0e5: time=117ms
Ping statistics for 2600:3c03::f03c:91ff:fedf:c0e5:
Packets: Sent = 4, Received = 4, Lost = 0 (0% loss),
Approximate round trip times in milli-seconds:
Minimum = 116ms, Maximum = 126ms, Average = 119ms
# End of transcript or log.
"""]]
### 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)
Sure. It's always rockin'!
[[!meta author=jkniiv]]

73
doc/bugs/few_tests_fail_under_encfs.mdwn Normal file
View file

@ -0,0 +1,73 @@
### Please describe the problem.
`encfs` I think in general is supported but there are some minor glitches (submitting one about ssh separately) which seems complicate use of git-annex under it.
### What steps will reproduce the problem?
Running `git annex test` causes a few tests to FAIL. After `git-annex` gets to operate "nominally" under encfs, we better add testing under `encfs` to [datalad/git-annex daily tests](https://github.com/datalad/git-annex/blob/master/.github/workflows/build-ubuntu.yaml#L247) .
Sample fail:
```
Tests
Repo Tests v10 locked
Init Tests
init: OK (0.97s)
add: OK (2.44s)
addurl: OK (2.65s)
conflict resolution (mixed locked and unlocked file): OK (9.30s)
version: OK (0.99s)
fix: FAIL (0.11s)
./Test/Framework.hs:86:
git clone failed with unexpected exit code (transcript follows)
fatal: hardlink different from source at 'tmprepo4/.git/objects/4b/825dc642cb6eb9a060e54bf8d69288fbee4904'
Use -p '/fix/' to rerun this test only.
```
and overall it is seems v10 locked specific tests
```
❯ ~/proj/CON/utils/bin/show-paths -f full-lines -e FAIL < .duct/logs/2025.01.04T19.33.23-680497_stdout
1350 Tests
1351 Repo Tests v10 locked
1358: fix: FAIL (0.11s)
1403 Tests
1404 Repo Tests v10 locked
1411: partial commit: FAIL (0.06s)
1417: reinject: FAIL (0.06s)
1449 Tests
1450 Repo Tests v10 locked
1457: edit (no pre-commit): FAIL (0.02s)
1463: magic: FAIL (0.03s)
```
### What version of git-annex are you using? On what operating system?
```shell
❯ git annex version
git-annex version: 10.20241031
build flags: Assistant Webapp Pairing Inotify DBus DesktopNotify TorrentParser MagicMime Servant Benchmark Feeds Testsuite S3 WebDAV
dependency versions: aws-0.24.1 bloomfilter-2.0.1.2 crypton-0.34 DAV-1.3.4 feed-1.3.2.1 ghc-9.6.6 http-client-0.7.17 persistent-sqlite-2.13.3.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 GITBUNDLE GITMANIFEST VURL X*
remote types: git gcrypt p2p S3 bup directory rsync web bittorrent webdav adb tahoe glacier ddar git-lfs httpalso borg rclone 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
```
### Please provide any additional information below.
[[!format sh """
# If you can, paste a complete transcript of the problem occurring here.
# If the problem is with the git-annex assistant, paste in .git/annex/daemon.log
# End of transcript or log.
"""]]
### 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)

8
doc/bugs/git-annex_proceeds_forward_if_freeze_script_fails/comment_2_ee183af32340ef0d5811ec746779dfa5._comment Normal file
View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="yarikoptic"
avatar="http://cdn.libravatar.org/avatar/f11e9c84cb18d26a1748c33b48c924b4"
subject="comment 2"
date="2025-01-07T01:06:57Z"
content="""
2nd demonstration on [add_config_var_preventing_adjusted_branch_mode/#comment-...](https://git-annex.branchable.com/projects/datalad/bugs-done/add_config_var_preventing_adjusted_branch_mode/#comment-d1335f67352cc698862464515363f061) demonstrates another scenario with undesired effect of failing to freeze/thaw -- git-annex just switches to adjusted branches mode. In that case there is likely no harm yet done to unwind and it would have better errored out altogether.
"""]]

78
doc/bugs/git-remote-annex_doesn__39__t_work_on_Windows___40__perms__41__/comment_3_520eaedda15b3a55f4c1f6d724734ff9._comment
View file

@ -1,78 +0,0 @@
[[!comment format=mdwn
username="jkniiv"
avatar="http://cdn.libravatar.org/avatar/05fd8b33af7183342153e8013aa3713d"
subject="comment 3"
date="2025-01-06T08:54:05Z"
content="""
> AFAIK, git-remote-annex is not installed on windows. I assume you set up the link to git-annex yourself.
That's right. Knowing that some of the functionality of git-remote-annex was already present I made
a symlink in a directory in my `$env:PATH` with `cmd /c mklink git-remote-annex ..\path-to\git-annex.exe`
(I have developer mode active in Windows settings) and that made git-remote-annex available to me/git-annex.
> This is a puzzling problem to me. I don't know anything about windows readonly attributes. But I don't think git-annex would ever set them.
>
>Indeed, it never freezes content on windows at all. That can be seen in the debug output you posted, where it does say it's \"thawing content\", but never \"freezing content\".
That is puzzling. Could the thawing do the wrong/opposite thing in some cases? Also, remember
that anything that does `chmod u-w` by way of Git Bash's own shell (sh.exe/bash.exe), e.g. via `sh -c 'chmod u-w file'`, will effect
a Windows readonly attribute on that file (thanks to MSYS2 behind the scenes):
```
e:\git-annex-tests\test-git-remote-annex\annex-c [adjusted/master(unlocked)]> touch ddd
e:\git-annex-tests\test-git-remote-annex\annex-c [adjusted/master(unlocked) +1 ~0 -0 !]> ls
Directory: e:\git-annex-tests\test-git-remote-annex\annex-c
Mode LastWriteTime Length Name
---- ------------- ------ ----
-a--- 1.6.2024 23:28 5 a-1
-a--- 1.6.2024 23:28 5 b-2
-a--- 1.6.2024 23:28 7 c-3
-a--- 6.1.2025 10:31 0 ddd
e:\git-annex-tests\test-git-remote-annex\annex-c [adjusted/master(unlocked) +1 ~0 -0 !]> sh -c 'chmod u-w ddd'
e:\git-annex-tests\test-git-remote-annex\annex-c [adjusted/master(unlocked) +1 ~0 -0 !]> ls
Directory: e:\git-annex-tests\test-git-remote-annex\annex-c
Mode LastWriteTime Length Name
---- ------------- ------ ----
-a--- 1.6.2024 23:28 5 a-1
-a--- 1.6.2024 23:28 5 b-2
-a--- 1.6.2024 23:28 7 c-3
-ar-- 6.1.2025 10:31 0 ddd
e:\git-annex-tests\test-git-remote-annex\annex-c [adjusted/master(unlocked) +1 ~0 -0 !]> rm ddd
Remove-Item: You do not have sufficient access rights to perform this operation or the item is hidden, system, or read only.
e:\git-annex-tests\test-git-remote-annex\annex-c [adjusted/master(unlocked) +1 ~0 -0 !]> sh -c 'type chmod'
chmod is /usr/bin/chmod
e:\git-annex-tests\test-git-remote-annex\annex-c [adjusted/master(unlocked) +1 ~0 -0 !]> sh -c 'type mount'
mount is /usr/bin/mount
e:\git-annex-tests\test-git-remote-annex\annex-c [adjusted/master(unlocked) +1 ~0 -0 !]> sh -c mount
C:/scoop/apps/git/2.47.1 on / type ntfs (binary,noacl,auto)
C:/scoop/apps/git/2.47.1/usr/bin on /bin type ntfs (binary,noacl,auto)
C:/Users/jkniiv/AppData/Local/Temp on /tmp type ntfs (binary,noacl,posix=0,usertemp)
C: on /c type ntfs (binary,noacl,posix=0,user,noumount,auto)
D: on /d type ntfs (binary,noacl,posix=0,user,noumount,auto)
E: on /e type ntfs (binary,noacl,posix=0,user,noumount,auto)
```
But I guess git-annex isn't calling out to external `chmod` in these cases.
>
>If you had somehow configured a freeze hook that set the readonly attribute, it would run it on windows. I suppose you would have thought to mention if that was the case though.
Nope. No freeze/thaw hooks set. I'm not that brave nor cognizant of how to script them in a fool proof manner. :)
```
e:\git-annex-tests\test-git-remote-annex\annex-c [adjusted/master(unlocked)]> git config get annex.freezecontent-command
e:\git-annex-tests\test-git-remote-annex\annex-c [adjusted/master(unlocked)]> git config get annex.thawcontent-command
```
>
>Also rather puzzling is that this is a temp object file, and not a .git/annex/objects/ file. So the failure is apparently happening in the middle of downloading the GITBUNDLE object, before it gets moved to that location. But the same code is run at that point as by any download of any git-annex object.
"""]]