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

only stage regular files from the journal

Browse source 
git-annex only writes regular files there, but other things may drop junk
like empty .DAV directories around the tree. And trying to hash such things
can have weird and hard to understand effects. So it seems best to do a
small amount of work in statting the journal file to make sure it's a
regular file.

Sponsored-by: Jack Hill on Patreon
This commit is contained in:
Joey Hess 2023-10-10 13:22:02 -04:00
parent 35206e32f2
commit c268dc5878
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
4 changed files with 43 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
doc/bugs/encountering_fatal_error_on_auto_annex_upgrade.mdwn
View file

@ -93,3 +93,4 @@ git-annex: fd:17: Data.ByteString.hGetLine: end of file
Yes, it's one of my favourite opensource tools.
> [[fixed|done]] --[[Joey]]

32
doc/bugs/encountering_fatal_error_on_auto_annex_upgrade/comment_5_28d35ef30f76ec326363d86ab2948ad3._comment Normal file
View file

@ -0,0 +1,32 @@
[[!comment format=mdwn
username="joey"
subject="""comment 5"""
date="2023-10-10T17:00:37Z"
content="""
Reproduced as follows:
joey@darkstar:~/tmp/bench>git init --bare dav
Initialized empty Git repository in /home/joey/tmp/bench/dav/
joey@darkstar:~/tmp/bench>cd dav
joey@darkstar:~/tmp/bench/dav>git-annex init --version=9
init ok
(recording state in git...)
joey@darkstar:~/tmp/bench/dav>for s in $(find -type d); do mkdir $s/.DAV;done
joey@darkstar:~/tmp/bench/dav>git-annex init --version=9
init fatal: Unable to add (null) to database
So it's these empty directories indeed. (Empty .DAV files don't cause this.)
In particular, it's any empty directory in .git/annex/journal. Which is
supposed to only contain files that git-annex wrote there. Staging the journal
is why git hash-object gets involved.
mkdir .DAV
echo .DAV | git hash-object -w --stdin-paths
fatal: Unable to add .DAV to database
Still unclear why git ends up with "(null)" in the error message.
While it will slow git-annex down a tiny bit to check if it's a regular file,
it seems better for git-annex to be robust against this kind of pollution.
"""]]