propigateAdjustedCommits in seekExportContent
authorJoey Hess <joeyh@joeyh.name>
Mon, 11 Sep 2023 18:54:26 +0000 (14:54 -0400)
committerJoey Hess <joeyh@joeyh.name>
Mon, 11 Sep 2023 18:54:26 +0000 (14:54 -0400)
commit7be8950138fb2ef1853a8f2df71b790b4d0a7b32
tree6a01a61d425500bd3b2e436a3744a440365a6d7d
parentaeaadb8eb802e9f8f806f358960f339a0b950f54
propigateAdjustedCommits in seekExportContent

push: When on an adjusted branch, propagate changes to parent branch before
updating export remotes.

This is a somewhat redundant call to propigateAdjustedCommits, since it
also gets called at pushLocal time. That other one needs to come after
importing from importtree remotes though, and seekExportContent has to come
earlier, so I don't see a way to avoid doing it twice.

Note that git-annex sync also manages to avoid the problem, it's only
git-annex push that had the bug.

Sponsored-by: Leon Schuermann on Patreon
CHANGELOG
Command/Sync.hs
doc/bugs/git_annex_push_fails_on_Windows.mdwn
doc/bugs/git_annex_push_fails_on_Windows/comment_2_d5c9fd2acdd5b320563a708889e82852._comment [new file with mode: 0644]