sync, assistant: When merge.directoryRenames is not set, default it it to "false"
Works better with automatic merge conflict resolution than git's ususual default of "conflict". This is not done when automatic merge conflict resolution is disabled. This commit was sponsored by Mark Reidenbach on Patreon.
This commit is contained in:
parent
f4c4b89aa3
commit
d120c73302
5 changed files with 34 additions and 6 deletions
|
@ -130,6 +130,7 @@ data GitConfig = GitConfig
|
|||
, receiveDenyCurrentBranch :: DenyCurrentBranch
|
||||
, gcryptId :: Maybe String
|
||||
, gpgCmd :: GpgCmd
|
||||
, mergeDirectoryRenames :: Maybe String
|
||||
}
|
||||
|
||||
extractGitConfig :: ConfigSource -> Git.Repo -> GitConfig
|
||||
|
@ -223,6 +224,7 @@ extractGitConfig configsource r = GitConfig
|
|||
, receiveDenyCurrentBranch = getDenyCurrentBranch r
|
||||
, gcryptId = getmaybe "core.gcrypt-id"
|
||||
, gpgCmd = mkGpgCmd (getmaybe "gpg.program")
|
||||
, mergeDirectoryRenames = getmaybe "directoryrenames"
|
||||
}
|
||||
where
|
||||
getbool k d = fromMaybe d $ getmaybebool k
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue