diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2018-02-26 14:10:03 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2018-02-26 14:10:03 -0400 |
| commit | 4f274998c0c39102ea9dff6fa9bef3127478ca66 (patch) | |
| tree | 6833e3a01c4163704abd15cdbaa8e205e6a88a3d /doc | |
| parent | 27b7de929fbdd8bde934d098ea47c418f688c464 (diff) | |
fix sync bug in direct mode
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.
Diffstat (limited to 'doc')
2 files changed, 17 insertions, 0 deletions
diff --git a/doc/bugs/annex_sync___40__in_direct_mode_only__41___does_not_actually_update_local_branch__47__tree.mdwn b/doc/bugs/annex_sync___40__in_direct_mode_only__41___does_not_actually_update_local_branch__47__tree.mdwn index 33749a001..b768f030a 100644 --- a/doc/bugs/annex_sync___40__in_direct_mode_only__41___does_not_actually_update_local_branch__47__tree.mdwn +++ b/doc/bugs/annex_sync___40__in_direct_mode_only__41___does_not_actually_update_local_branch__47__tree.mdwn @@ -112,3 +112,5 @@ index 0000000..d00491f 6.20180206+gitg638032f3a-1~ndall+1 [[!meta author=yoh]] + +> [[fixed|done]] --[[Joey]] diff --git a/doc/bugs/annex_sync___40__in_direct_mode_only__41___does_not_actually_update_local_branch__47__tree/comment_1_6fb5a4fec435eccc0528744c55b7468c._comment b/doc/bugs/annex_sync___40__in_direct_mode_only__41___does_not_actually_update_local_branch__47__tree/comment_1_6fb5a4fec435eccc0528744c55b7468c._comment new file mode 100644 index 000000000..04b6d6202 --- /dev/null +++ b/doc/bugs/annex_sync___40__in_direct_mode_only__41___does_not_actually_update_local_branch__47__tree/comment_1_6fb5a4fec435eccc0528744c55b7468c._comment @@ -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. +"""]] |