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

Merge branch 'master' into exportreeplus

Browse source
This commit is contained in:
Joey Hess 2024-08-06 14:46:33 -04:00
commit c53f61e93f
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
4 changed files with 69 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Annex/Proxy.hs
View file

@ -212,7 +212,6 @@ proxySpecialRemote protoversion r ihdl ohdl owaitv oclosedv = go
storetofile _ _ n [] = pure n storetofile _ _ n [] = pure n
storetofile iv h n (b:bs) = do storetofile iv h n (b:bs) = do
writeVerifyChunk iv h b writeVerifyChunk iv h b
B.hPut h b
storetofile iv h (n - fromIntegral (B.length b)) bs storetofile iv h (n - fromIntegral (B.length b)) bs
proxyget offset af k = withproxytmpfile k $ \tmpfile -> do proxyget offset af k = withproxytmpfile k $ \tmpfile -> do

3
CHANGELOG
View file

@ -1,6 +1,5 @@
git-annex (10.20240732) UNRELEASED; urgency=medium git-annex (10.20240732) UNRELEASED; urgency=medium
* Avoid loading cluster log at startup.
* Remove debug output (to stderr) accidentially included in * Remove debug output (to stderr) accidentially included in
last version. last version.
* Special remotes configured with exporttree=yes annexobjects=yes * Special remotes configured with exporttree=yes annexobjects=yes
@ -9,6 +8,8 @@ git-annex (10.20240732) UNRELEASED; urgency=medium
exporttree=yes annexobjects=yes. exporttree=yes annexobjects=yes.
* git-remote-annex: Store objects in exportree=yes special remotes * git-remote-annex: Store objects in exportree=yes special remotes
in the same paths used by annexobjects=yes. in the same paths used by annexobjects=yes.
* When proxying an upload to a special remote, verify the hash.
* Avoid loading cluster log at startup.
-- Joey Hess <id@joeyh.name> Wed, 31 Jul 2024 15:52:03 -0400 -- Joey Hess <id@joeyh.name> Wed, 31 Jul 2024 15:52:03 -0400

13
doc/bugs/Trust_but_Verify__58___RClone/comment_5_a71fd66c9e5a70ea12166c2ac0165ec9._comment Normal file
View file

@ -0,0 +1,13 @@
[[!comment format=mdwn
username="Spencer"
avatar="http://cdn.libravatar.org/avatar/2e0829f36a68480155e09d0883794a55"
subject="D: Correct"
date="2024-08-05T22:17:55Z"
content="""
Hi D,
That is correct: I am deleting the file via the dropbox sync utility.
What's odd is rclone is aware of the file's absense, so far as `ls` is concerned at least.
I suspect I will recreate your non-issue if I try with the sync utility disabled, I will explore. In the meantime, maybe you can reproduce the issue with the sync utility or have debug command suggestions I could run?
"""]]

54
doc/bugs/assist_and_sync_print_url_setting_name_to_stderr.mdwn Normal file
View file

@ -0,0 +1,54 @@
### Please describe the problem.
With the latest git-annex-standalone version `git annex assist` and `git annex sync --content` print uninformational messages of the form "remote.<name\>.url" to stderr. This doesn't really break anything, but it makes annextimelog print a warning because of the non-empty stderr.
### What steps will reproduce the problem?
Run `git annex assist` or `git annex sync --content`.
### What version of git-annex are you using? On what operating system?
```
git-annex version: 10.20240731-g76f31d59b034ef647d0c94bc42aa75f411992230
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.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 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
local repository version: 10
```
On Ubuntu 22.04, installed from the currently published tarball here: https://downloads.kitenet.net/git-annex/linux/current/
### 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
$ git annex assist
commit
On branch main
nothing to commit, working tree clean
ok
remote.fzj-time-management.url
remote.bittorrent.url
remote.web.url
# End of transcript or log.
"""]]
The last 3 lines being printed on stderr.
### 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)
Yes! I am now using git-annex through annextimelog to track my working times and automatically submit them to my employer and it is working really well. This is also where I found this issue though, annextimelog treats a non-empty stderr from git-annex as something to warn about.
> Indeed, I've already fixed this in master. I plan to make a release
> soon for it though since it's a reversion. [[done]] --[[Joey]]