[Libreoffice] [PATCH] get rid of duplicated .gitattributes files

Miklos Vajna vmiklos at frugalware.org
Sat Mar 12 14:46:59 PST 2011


Hi,

So far we have 4 .gitattributes files in the root of 4 repos with the
same contents. To have them in the rest of the repos and avoid
duplication, it's better to have a single one in the bootstrap repo and
configure the rest of the repos to use that one.

I'm attaching two patches:

1) is for bootstrap
2) is for extensions/filters/libs-gui/testing

OK to push?

Thanks.
-------------- next part --------------
From 23513602a6d68b65b127a42d461b9d9721273a46 Mon Sep 17 00:00:00 2001
From: Miklos Vajna <vmiklos at frugalware.org>
Date: Sat, 12 Mar 2011 23:37:38 +0100
Subject: [PATCH] Introduce a single .gitattributes file in bootstrap

---
 .gitattributes |    2 ++
 g              |    3 +++
 2 files changed, 5 insertions(+), 0 deletions(-)
 create mode 100644 .gitattributes

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..416fa8c
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,2 @@
+*.doc binary
+*.sdw binary
diff --git a/g b/g
index a832fd2..74ad7db 100755
--- a/g
+++ b/g
@@ -35,6 +35,9 @@ function update_hooks()
     if [ -z "$(git config push.default)" ] ; then
         git config push.default tracking
     fi
+    if [ "$PWD" != "$RAWBUILDDIR" -a -z "$(git config core.attributesfile)" ]; then
+        git config core.attributesfile $RAWBUILDDIR/.gitattributes
+    fi
 }
 
 # extra params for some commands, like log
-- 
1.7.4.1

-------------- next part --------------
From 315f0c467a95a542eeed2485eaa21a6d068bbec0 Mon Sep 17 00:00:00 2001
From: Miklos Vajna <vmiklos at frugalware.org>
Date: Sat, 12 Mar 2011 23:37:39 +0100
Subject: [PATCH] Introduce a single .gitattributes file in bootstrap

---
 .gitattributes |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)
 delete mode 100644 .gitattributes

diff --git a/.gitattributes b/.gitattributes
deleted file mode 100644
index 416fa8c..0000000
--- a/.gitattributes
+++ /dev/null
@@ -1,2 +0,0 @@
-*.doc binary
-*.sdw binary
-- 
1.7.4.1

-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: not available
URL: <http://lists.freedesktop.org/archives/libreoffice/attachments/20110312/73b30286/attachment.pgp>


More information about the LibreOffice mailing list