[TopGit PATCH] tg.sh: it's info/attributes not info/gitattributes

Bert Wesarg· Aug 8, 2008, 06:43 UTC · lore

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

Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com>

---
 tg.sh |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

Show changes to tg.sh +2 −2

diff --git a/tg.sh b/tg.sh
index 03a392b..209b69e 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'

-- 
tg: (e311d15..) t/its-info-attributes (depends on: master)

Petr Baudis· Aug 9, 2008, 00:28 UTC · re: Bert Wesarg · lore

Re: [PATCH] [TopGit] Pretty print the help creation commands in Makefile.

Hi,

  thanks, patches applied (after heavy dose of swearing in the general
direction of git-am and git-apply at #git - now I'm really ashamed
I've ever put "git is well-suited for patch-oriented workflows" on
any of my slides).

-- 
				Petr "Pasky" Baudis
The next generation of interesting software will be done
on the Macintosh, not the IBM PC.  -- Bill Gates

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