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

fix sync bug in direct mode

Browse source 
sync: Fix bug that prevented pulling changes into direct mode repositories
that were committed to remotes using git commit rather than git-annex sync.

This commit was supported by the NSF-funded DataLad project.
This commit is contained in:
Joey Hess 2018-02-26 14:10:03 -04:00
parent 42f154bd7e
commit db057dcff0
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
4 changed files with 21 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
doc/bugs/annex_sync___40__in_direct_mode_only__41___does_not_actually_update_local_branch__47__tree.mdwn
View file

@ -112,3 +112,5 @@ index 0000000..d00491f
6.20180206+gitg638032f3a-1~ndall+1
[[!meta author=yoh]]
> [[fixed|done]] --[[Joey]]

15
doc/bugs/annex_sync___40__in_direct_mode_only__41___does_not_actually_update_local_branch__47__tree/comment_1_6fb5a4fec435eccc0528744c55b7468c._comment Normal file
View file

@ -0,0 +1,15 @@
[[!comment format=mdwn
username="joey"
subject="""comment 1"""
date="2018-02-26T17:38:05Z"
content="""
Seems that it's only merging from remotes/origin/synced/master, not
remotes/origin/master. When `git annex sync` is used in the first
repository, that works, but not when `git commit` is used.
And it's due to being in direct mode because the annex/direct/master
branch is checked out, so it tries to merge from
remotes/origin/direct/master, which doesn't exist.
This does not seem to be a reversion, but a long-ago oversight.
"""]]