annex.dotfiles
The git add behavior changes could be avoided if it turns out to be really annoying, but then it would need to behave the old way when annex.dotfiles=false and the new way when annex.dotfiles=true. I'd rather not have the config option result in such divergent behavior as `git annex add .` skipping a dotfile (old) vs adding to annex (new). Note that the assistant always adds dotfiles to the annex. This is surprising, but not new behavior. Might be worth making it also honor annex.dotfiles, but I wonder if perhaps some user somewhere uses it and keeps large files in a directory that happens to begin with a dot. Since dotfiles and dotdirs are a unix culture thing, and the assistant users may not be part of that culture, it seems best to keep its current behavior for now.
This commit is contained in:
parent
2b821eb225
commit
3cd3757236
15 changed files with 112 additions and 41 deletions
|
@ -86,6 +86,7 @@ data GitConfig = GitConfig
|
|||
, annexAriaTorrentOptions :: [String]
|
||||
, annexCrippledFileSystem :: Bool
|
||||
, annexLargeFiles :: Configurable (Maybe String)
|
||||
, annexDotFiles :: Configurable Bool
|
||||
, annexGitAddToAnnex :: Bool
|
||||
, annexAddSmallFiles :: Bool
|
||||
, annexFsckNudge :: Bool
|
||||
|
@ -158,6 +159,7 @@ extractGitConfig configsource r = GitConfig
|
|||
, annexCrippledFileSystem = getbool (annex "crippledfilesystem") False
|
||||
, annexLargeFiles = configurable Nothing $
|
||||
fmap Just $ getmaybe (annex "largefiles")
|
||||
, annexDotFiles = configurable False $ getmaybebool (annex "dotfiles")
|
||||
, annexGitAddToAnnex = getbool (annex "gitaddtoannex") True
|
||||
, annexAddSmallFiles = getbool (annex "addsmallfiles") True
|
||||
, annexFsckNudge = getbool (annex "fscknudge") True
|
||||
|
@ -232,6 +234,7 @@ mergeGitConfig gitconfig repoglobals = gitconfig
|
|||
, annexSyncContent = merge annexSyncContent
|
||||
, annexResolveMerge = merge annexResolveMerge
|
||||
, annexLargeFiles = merge annexLargeFiles
|
||||
, annexDotFiles = merge annexDotFiles
|
||||
, annexAddUnlocked = merge annexAddUnlocked
|
||||
}
|
||||
where
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue