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

sync, push: Avoid trying to send individual files to special remotes configured with importtree=yes exporttree=no

Browse source 
That will always fail. It already skipped doing this when exporttree=yes.
This commit is contained in:
Joey Hess 2023-12-26 15:56:39 -04:00
parent 766dfc794a
commit 6d789c9c81
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
3 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CHANGELOG
View file

@ -23,6 +23,8 @@ git-annex (10.20231130) UNRELEASED; urgency=medium
* sync: Fix locking problems during merge when annex.pidlock is set. * sync: Fix locking problems during merge when annex.pidlock is set.
* Avoid a problem with temp file names ending in "." on certian * Avoid a problem with temp file names ending in "." on certian
filesystems that have problems with such filenames. filesystems that have problems with such filenames.
* sync, push: Avoid trying to send individual files to special remotes
configured with importtree=yes exporttree=no, which would always fail.
-- Joey Hess <id@joeyh.name> Thu, 30 Nov 2023 14:48:12 -0400 -- Joey Hess <id@joeyh.name> Thu, 30 Nov 2023 14:48:12 -0400

2
Command/Sync.hs
View file

@ -955,7 +955,7 @@ syncFile o ebloom rs af k = do
wantput r wantput r
| pushOption o == False && operationMode o /= SatisfyMode = return False | pushOption o == False && operationMode o /= SatisfyMode = return False
| Remote.readonly r || remoteAnnexReadOnly (Remote.gitconfig r) = return False | Remote.readonly r || remoteAnnexReadOnly (Remote.gitconfig r) = return False
| isExport r = return False | isExport r || isImport r = return False
| isThirdPartyPopulated r = return False | isThirdPartyPopulated r = return False
| otherwise = wantGetBy True (Just k) af (Remote.uuid r) | otherwise = wantGetBy True (Just k) af (Remote.uuid r)
handleput lack inhere handleput lack inhere

12
doc/forum/Don__39__t_copy_files_to_exporttree__61__no_remote/comment_5_e9ea995c99785dd6dffba91ef0fceb02._comment Normal file
View file

@ -0,0 +1,12 @@
[[!comment format=mdwn
username="joey"
subject="""comment 5"""
date="2023-12-26T19:44:23Z"
content="""
I reproduced it with the current version and a remote set up with:
git-annex initremote test type=directory directory=../d encryption=none exporttree=no importtree=yes
git config remote.directory.annex-tracking-branch master
Fixed for tomorrow's release.
"""]]