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 2024-04-30 14:44:59 -04:00
commit 46aae325af
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
6 changed files with 80 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

8
doc/bugs/Dropping_filename_extensions_with_more_than_4_char/comment_1_ecc9ff2bca0638797f358d5ff0d9e363._comment Normal file
View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="nobodyinperson"
avatar="http://cdn.libravatar.org/avatar/736a41cd4988ede057bae805d000f4f5"
subject="annex.maxextensionlength and annex.maxextensions"
date="2024-04-27T19:16:29Z"
content="""
See the recently added `annex.maxextensionlength` and `annex.maxextensions` configurations: https://git-annex.branchable.com/git-annex/, which should fix your issue.
"""]]

43
doc/bugs/adjusted__40__unlocked__41___does_not_honor_addunlocked.mdwn Normal file
View file

@ -0,0 +1,43 @@
### Please describe the problem.
Files added/modified in an `adjusted(unlocked)` branch get added as locked (symlink) files to the related branch, without honoring the `annex.addunlocked` setting.
### What steps will reproduce the problem?
[[!format sh """
#!/bin/sh -x
set -x
test -e testrepo && chmod +w -R testrepo && rm -rf testrepo
git -c init.defaultBranch=main init testrepo
cd testrepo
git annex init
git annex config --set annex.addunlocked true
echo content > README.md
git annex assist
git annex adjust --unlock
echo "changed on adjusted(unlocked) branch" > README.md
git annex assist
git switch main
file README.md # should be an unlocked file, but is a symlink
# README.md: symbolic link to .git/annex/objects/1z/J4/SHA256E-s37--947ef3df7717076c1cdd9c17f5fe90d69347c479e491500dac3051a4a03c6ecb.md/SHA256E-s37--947ef3df7717076c1cdd9c17f5fe90d69347c479e491500dac3051a4a03c6ecb.md
"""]]
### What version of git-annex are you using? On what operating system?
[[!format sh """
# on NixOS
> git annex version
git-annex version: 10.20240129
build flags: Assistant Webapp Pairing Inotify DBus DesktopNotify TorrentParser MagicMime Feeds Testsuite S3 WebDAV
dependency versions: aws-0.24.1 bloomfilter-2.0.1.2 crypton-0.32 DAV-1.3.4 feed-1.3.2.1 ghc-9.4.8 http-client-0.7.15 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
"""]]
### 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)
Hell yeah, git annex rules! 💪

8
doc/bugs/safe.bareRepository_breaks_git-annex_uuid/comment_1_0a5faade2dfbb0dfe5d94d37450ba06c._comment Normal file
View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="yarikoptic"
avatar="http://cdn.libravatar.org/avatar/f11e9c84cb18d26a1748c33b48c924b4"
subject="comment 1"
date="2024-04-29T13:13:48Z"
content="""
> fixed in [10.20230626-58-ga05bc6a314 AKA 10.20230802~99](https://git.kitenet.net/index.cgi/git-annex.git/commit/?id=a05bc6a31459dedd5d199fbc864af2e9d7d1f6d1) --[[yarikoptic]]
"""]]

3
doc/forum/Disable_autoswitching_to_adjusted__40__unlocked__41___branch.mdwn Normal file
View file

@ -0,0 +1,3 @@
Is it possible to disable the automatic switching to the `adjusted/main(unlocked)` branch?
Context: For our measurement campaign, have a policy to only use unlocked files anyway and git-annex always initially switching to that adjusted branch is a bit annoying as we have to manually switch back to the default branch - of which the name is not always the same. Because when you `git annex assist` in an empty repo, it first pushes the `synced/main` branch, which makes it the default on the (Gitea) remote, so subsequent `git clone`s use that as default branch. I'd like to avoid the adjusted branch if possible as I have hit some performance / merge conflict situations with it in the past.

8
doc/forum/how_to___34__move__34___URL_between_remotes__63__/comment_7_742fde3d8f7aa0caa39dadc961c1b3d3._comment Normal file
View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="yarikoptic"
avatar="http://cdn.libravatar.org/avatar/f11e9c84cb18d26a1748c33b48c924b4"
subject="comment 7"
date="2024-04-25T21:11:56Z"
content="""
Thank you Joey! I hope that release is coming some time soon?
"""]]

10
doc/git-annex-whereis/comment_3_d06a33bfaeb2a9274d12639fdedcfa8a._comment Normal file
View file

@ -0,0 +1,10 @@
[[!comment format=mdwn
username="rshalaev"
avatar="http://cdn.libravatar.org/avatar/d7f181d338cbcef7418faa01f0441e86"
subject="How to find last available version of a file?"
date="2024-04-29T14:07:40Z"
content="""
Repo that contains the latest/current version of a file is not accessible. Can git annex whereis find the last available version of a file in other repos (or a specific repo)?
I can looping through commit log and running whereis for each commit until an earlier version of a file is found, but perhaps there is a better way to do it with a single command?
"""]]