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

fix buggy sync to exporttree remote when annex-tracking-branch is not checked out

Browse source 
sync: Fix a bug that caused files to be removed from an importtree=yes
exporttree=yes special remote when the remote's annex-tracking-branch was
not the currently checked out branch.

Sponsored-by: Max Thoursie on Patreon
This commit is contained in:
Joey Hess 2023-02-10 15:49:15 -04:00
parent 5c6e1f5178
commit e9b6efac5a
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
3 changed files with 30 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

4
doc/bugs/sync_with_export_remote_deletes_files_from_it_when_ran_in_other_than_tracking_branch.mdwn
View file

@ -12,3 +12,7 @@ remains. But bad.
The problem seems to be that it assumes it's merged d/master into master, but
that does not happen since master is not the current branch. And so it then
updates d to look like master. --[[Joey]]
> [[fixed|done]] by avoiding updating export remotes when
> the current branch tree is not the same as the tracking branch tree.
> --[[Joey]]