summaryrefslogtreecommitdiff
path: root/Core.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2010-10-16 22:36:35 -0400
committerGravatar Joey Hess <joey@kitenet.net>2010-10-16 22:36:35 -0400
commitda453ba70149444672b8cd64e36fe34604edce73 (patch)
treed72f9886f8df45795589c37e30b8b9a2947c25ce /Core.hs
parent19daf3fca40d99dd305a75e10dcaa8fbc734598b (diff)
bugfix: don't add files under .git-annex
That could happen if git annex add -N were used repeatedly..
Diffstat (limited to 'Core.hs')
-rw-r--r--Core.hs2
1 files changed, 1 insertions, 1 deletions
diff --git a/Core.hs b/Core.hs
index 021595f8b..70e6e6680 100644
--- a/Core.hs
+++ b/Core.hs
@@ -51,7 +51,7 @@ gitAttributes repo = do
commit
else return ()
where
- attrLine = stateLoc ++ "/*.log merge=union"
+ attrLine = stateLoc ++ "*.log merge=union"
attributes = Git.attributes repo
commit = do
Git.run repo ["add", attributes]