multiple -m second try
Test suite passes this time. When committing the adjusted branch, use the old method to make a message that old git-annex can consume. Also made the code accept the new message, so that eventually commitTreeExactMessage can be removed. Sponsored-by: Kevin Mueller on Patreon
This commit is contained in:
parent
69546f73ca
commit
2c73845d90
15 changed files with 77 additions and 41 deletions
|
@ -86,7 +86,7 @@ data ImportCommitConfig = ImportCommitConfig
|
|||
{ importCommitTracking :: Maybe Sha
|
||||
-- ^ Current commit on the remote tracking branch.
|
||||
, importCommitMode :: Git.Branch.CommitMode
|
||||
, importCommitMessage :: String
|
||||
, importCommitMessages :: [String]
|
||||
}
|
||||
|
||||
{- Buils a commit for an import from a special remote.
|
||||
|
@ -251,7 +251,7 @@ buildImportCommit' remote importcommitconfig mtrackingcommit imported@(History t
|
|||
|
||||
mkcommit parents tree = inRepo $ Git.Branch.commitTree
|
||||
(importCommitMode importcommitconfig)
|
||||
(importCommitMessage importcommitconfig)
|
||||
(importCommitMessages importcommitconfig)
|
||||
parents
|
||||
tree
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue