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

use Branch.name instead of hard coding the branch name

Browse source 
Makes much more clear why ActionItemOther is being passed "git-annex".
This commit is contained in:
Joey Hess 2020-09-15 15:44:37 -04:00
parent 3a05d53761
commit 2a3c2b1843
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
3 changed files with 11 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Command/Merge.hs
View file

@ -13,6 +13,7 @@ import qualified Git
import qualified Git.Branch
import Annex.CurrentBranch
import Command.Sync (prepMerge, mergeLocal, mergeConfig, merge, SyncOptions(..))
import Git.Types
cmd :: Command
cmd = command "merge" SectionMaintenance
@ -35,7 +36,7 @@ mergeAnnexBranch = starting "merge" ai si $ do
Annex.Branch.commit =<< Annex.Branch.commitMessage
next $ return True
where
ai = ActionItemOther (Just "git-annex")
ai = ActionItemOther (Just (fromRef Annex.Branch.name))
si = SeekInput []
mergeSyncedBranch :: CommandStart