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
|
@ -77,7 +77,7 @@ makeRemoteTrackingBranchMergeCommit' commitsha importedhistory treesha = do
|
|||
cmode <- annexCommitMode <$> Annex.getGitConfig
|
||||
inRepo $ Git.Branch.commitTree
|
||||
cmode
|
||||
"remote tracking branch"
|
||||
["remote tracking branch"]
|
||||
[commitsha, importedhistory]
|
||||
treesha
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue