From: Bert Wesarg <bert.wesarg@googlemail.com>
Date: Fri, 8 Aug 2008 06:43:17 +0000 (+0200)
Subject: tg.sh: it's info/attributes not info/gitattributes
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=topgit.git;a=commitdiff_plain;h=c35a45e80239652e8fc5f528292a1ea458d61d7c;hp=e1296b6a8a09eaddaba5a3fc59314d50d7091d55

tg.sh: it's info/attributes not info/gitattributes

The merge attribute hasn't any effect, because the wrong attribute file was
used.

Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>
Signed-off-by: Petr Baudis <pasky@suse.cz>
---

diff --git a/tg.sh b/tg.sh
index ead2361..c5c71a2 100644
--- a/tg.sh
+++ b/tg.sh
@@ -45,11 +45,11 @@ setup_hook()
 # setup_ours (no arguments)
 setup_ours()
 {
-	if [ ! -s "$git_dir/info/gitattributes" ] || ! grep -q topmsg "$git_dir/info/gitattributes"; then
+	if [ ! -s "$git_dir/info/attributes" ] || ! grep -q topmsg "$git_dir/info/attributes"; then
 		{
 			echo -e ".topmsg\tmerge=ours"
 			echo -e ".topdeps\tmerge=ours"
-		} >>"$git_dir/info/gitattributes"
+		} >>"$git_dir/info/attributes"
 	fi
 	if ! git config merge.ours.driver >/dev/null; then
 		git config merge.ours.name '"always keep ours" merge driver'