Fatal error from remote when pushing to alberti/ldap

When updating the key for jnewsome in #41022 (closed) I hit a similar issue as #41013 (closed) :

$ git push alberti                                                  
Énumération des objets: 7, fait.                                                                          
Décompte des objets: 100% (7/7), fait.                                                                                                                                                                               
Compression par delta en utilisant jusqu'à 4 fils d'exécution                                             
Compression des objets: 100% (4/4), fait.                                                                 
Écriture des objets: 100% (4/4), 577 octets | 577.00 Kio/s, fait.                                                                                                                                                    
Total 4 (delta 3), réutilisés 0 (delta 0), réutilisés du pack 0                       
remote: + env -i make -C /srv/db.torproject.org/keyrings                                                                                                                                                             
remote: make: Entering directory '/srv/db.torproject.org/keyrings'                                        
remote: umask 002 && \                                                                                                                                                                                               
remote:         cd keyring && \                                                                           
remote:         git pull && \                                                                             
remote:         rm -f torproject-keyring.gpg && \                                                                                                                                                                    
remote:         ./build-keyring && \                                                                      
remote:         cp -f torproject-*.gpg ..                                                                 
remote: fatal: detected dubious ownership in repository at '/srv/db.torproject.org/keyrings/keyring'                                                                                                                 
remote: To add an exception for this directory, call:                                                                                                                                                                
remote:                                                                                                   
remote:         git config --global --add safe.directory /srv/db.torproject.org/keyrings/keyring          
remote: make: *** [Makefile:5: torproject-keyring.gpg] Error 128                                                                                                                                                     
remote: make: Leaving directory '/srv/db.torproject.org/keyrings'                                                                                                                                                    
To alberti.torproject.org:/srv/db.torproject.org/keyrings/keyring.git                                     
   3ce936a..d00c61c  master -> master

However, running the git config command did not fix the problem, likely because of the env -i bit unsetting $HOME and making git unable to find $HOME. I had to run make -C /srv/db.torproject.org/keyrings manually instead.

I'm wondering if the fix here is to change git pull with git -c safe.directory=/srv/db.torproject.org/keyrings/keyring pull in the Makefile?

Assignee Loading
Time tracking Loading