summaryrefslogtreecommitdiff
path: root/Git/Command.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2013-11-05 13:38:37 -0400
committerGravatar Joey Hess <joey@kitenet.net>2013-11-05 13:38:37 -0400
commite96c613c026c2d0bd6cce7210b058533d3ce972c (patch)
treea44c598f4b1047593f4c856fdd26e9ac8400556d /Git/Command.hs
parent70db4ebffa5a66ac97791d6780cb203ad6ac642f (diff)
pass -c option on to all git commands run
The -c option now not only modifies the git configuration seen by git-annex, but it is passed along to every git command git-annex runs. This was easy to plumb through because gitCommandLine is already used to construct every git command line, to add --git-dir and --work-tree
Diffstat (limited to 'Git/Command.hs')
-rw-r--r--Git/Command.hs3
1 files changed, 2 insertions, 1 deletions
diff --git a/Git/Command.hs b/Git/Command.hs
index 8b027d2c3..adcc53bcd 100644
--- a/Git/Command.hs
+++ b/Git/Command.hs
@@ -21,7 +21,8 @@ import Git.FilePath
{- Constructs a git command line operating on the specified repo. -}
gitCommandLine :: [CommandParam] -> Repo -> [CommandParam]
-gitCommandLine params Repo { location = l@(Local _ _ ) } = setdir : settree ++ params
+gitCommandLine params r@(Repo { location = l@(Local _ _ ) }) =
+ setdir : settree ++ gitGlobalOpts r ++ params
where
setdir = Param $ "--git-dir=" ++ gitpath (gitdir l)
settree = case worktree l of