diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2016-02-29 15:23:08 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-02-29 15:23:08 -0400 |
| commit | 0fbaf6062e95885daf0da056c2a77d9e20154d41 (patch) | |
| tree | 1d1d1b85bc5960e383a9705b9a25b65c8a99b48b /Command/Merge.hs | |
| parent | 03e0498964647559f5eeece6750c8a2999860ae0 (diff) | |
make sync aware of adjusted branches
So, it will pull and push the original branch, not the adjusted one.
And, for merging, it will use updateAdjustedBranch (not implemented yet).
Note that remaining uses of Git.Branch.current need to be checked too;
for things that should act on the original branch, and not the adjusted
branch.
Diffstat (limited to 'Command/Merge.hs')
| -rw-r--r-- | Command/Merge.hs | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Command/Merge.hs b/Command/Merge.hs index 6ea8a68b1..908f3c1aa 100644 --- a/Command/Merge.hs +++ b/Command/Merge.hs @@ -9,8 +9,7 @@ module Command.Merge where import Command import qualified Annex.Branch -import qualified Git.Branch -import Command.Sync (prepMerge, mergeLocal) +import Command.Sync (prepMerge, mergeLocal, getCurrBranch) cmd :: Command cmd = command "merge" SectionMaintenance @@ -34,4 +33,4 @@ mergeBranch = do mergeSynced :: CommandStart mergeSynced = do prepMerge - mergeLocal =<< inRepo Git.Branch.current + mergeLocal =<< join getCurrBranch |