diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2016-09-21 15:18:51 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-09-21 15:23:47 -0400 |
| commit | bc5b0e073128419de4c2c0d05d8e15f9a2195a42 (patch) | |
| tree | 82eae418d2373bb77eae1af71827b3859bf0cea1 /Command/Sync.hs | |
| parent | 7bed6cb201b5ac528383b830ef5ab8807cb86adb (diff) | |
fix bugs in handing of deep branches with sync and adjusted branches
* sync: Previously, when run in a branch with a slash in its name,
such as "foo/bar", the sync branch was "synced/bar". That conflicted
with the sync branch used for branch "bar", so has been changed to
"synced/foo/bar".
* adjust: Previously, when adjusting a branch with a slash in its name,
such as "foo/bar", the adjusted branch was "adjusted/bar(unlocked)".
That conflicted with the adjusted branch used for branch "bar",
so has been changed to "adjusted/foo/bar(unlocked)"
* Also, running sync in an adjusted branch did not correctly sync
changes back to the parent branch when it had a slash in its name.
This bug has been fixed.
Eliminate use of Git.Ref.under and Git.Ref.basename; using
Git.Ref.underBase and Git.Ref.base make everything handle deep branches
correctly.
Probably noone was adjusting deep branches, and v6 is still experimental
anyway, so I'm not going to worry about the mess that was left by that bug.
In the case of git-annex sync, using a fixed git-annex with an old unfixed
one will mean they use different sync branches for a deep branch, and so
they may stop syncing until the old one is upgraded. However, that's only
a problem when syncing between repositories without going via a central
bare repository. Added a warning about this to the CHANGELOG, but it's
probably not going to affect many people at all.
This commit was sponsored by Riku Voipio.
Diffstat (limited to 'Command/Sync.hs')
| -rw-r--r-- | Command/Sync.hs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Command/Sync.hs b/Command/Sync.hs index fd9d0b278..d7edac743 100644 --- a/Command/Sync.hs +++ b/Command/Sync.hs @@ -178,7 +178,7 @@ merge (b, _) mergeconfig commitmode tomerge = autoMergeFrom tomerge b mergeconfig commitmode syncBranch :: Git.Branch -> Git.Branch -syncBranch = Git.Ref.under "refs/heads/synced" . fromDirectBranch . fromAdjustedBranch +syncBranch = Git.Ref.underBase "refs/heads/synced" . fromDirectBranch . fromAdjustedBranch remoteBranch :: Remote -> Git.Ref -> Git.Ref remoteBranch remote = Git.Ref.underBase $ "refs/remotes/" ++ Remote.name remote |