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-07-21 10:53:08 -04:00
commit 549569533b
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
4 changed files with 47 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

15
doc/bugs/Missing_file_content_in_secondary_worktree___40__win__41__/comment_8_f8637dc282e5867bdce23e88f55474e5._comment Normal file
View file

@ -0,0 +1,15 @@
[[!comment format=mdwn
username="mih"
avatar="http://cdn.libravatar.org/avatar/f881df265a423e4f24eff27c623148fd"
subject="Thanks!"
date="2025-07-17T06:58:01Z"
content="""
Thanks for the fix! I tried to confirm it in my original test case, but currently it FTBFS with
```
[570 of 755] Compiling Command.P2PHttp
/git-annex-wheel/git-annex/Command/P2PHttp.hs:305:73: error: [GHC-83865]
[571 of 755] Compiling Command.P2P
• Couldn't match type ‘OsString’
```
"""]]

16
doc/forum/strange_content_of_files.mdwn Normal file
View file

@ -0,0 +1,16 @@
Some of my files suddenly have a content like this:
<<<<<<< HEAD
/annex/objects/SHA256E-s761469--0311429015097e62e392d8c0c7c8250a07eadbf9670f8396286024ebc7b2d9ec.svg
=======
/annex/objects/SHA256E-s744177--4b9dce2dc6a6933defa7b69e5ebbd8f4fd653246c31891b7fb9b27ffec038f22.svg
>>>>>>> refs/remotes/singapore/master
or just
/annex/objects/SHA256E-s1155603--95cefc864632f441029328e96414b026492718789941377f59b1a4bf6694be69.jpg
instead of the actual content. These are not links or something.
What happened?

8
doc/forum/strange_content_of_files/comment_1_c7e71dd9db16a9316eaf9ed8aa8fb8aa._comment Normal file
View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="jose1711"
avatar="http://cdn.libravatar.org/avatar/bca6c53d89f86ddae44aa62f99c670a4"
subject="fs type?"
date="2025-07-18T09:10:50Z"
content="""
does the underlying filesystem support symlinks?
"""]]

8
doc/forum/strange_content_of_files/comment_2_422dbe52b347670a8dde34fb18a81999._comment Normal file
View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="jnkl"
avatar="http://cdn.libravatar.org/avatar/2ab576f3bf2e0d96b1ee935bb7f33dbe"
subject="comment 2"
date="2025-07-19T09:05:46Z"
content="""
Yes, it's btrfs.
"""]]