From da453ba70149444672b8cd64e36fe34604edce73 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 16 Oct 2010 22:36:35 -0400 Subject: bugfix: don't add files under .git-annex That could happen if git annex add -N were used repeatedly.. --- Core.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Core.hs') 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] -- cgit v1.2.3