From 2dd1508360a843040e771423b4c7f66d9a1f57d7 Mon Sep 17 00:00:00 2001
From: Per Cederqvist <ceder@lysator.liu.se>
Date: Sun, 8 Feb 2015 22:16:47 +0100
Subject: [PATCH] Don't unpack the upstream .git repository.

Starting with Bugzilla 4.4.7, the distributed tar files include a .git
directory. Needless to say, unpacking that on top of our own .git
directory results in chaos (including a changed "git remote" URL for
origin).  Exlude the .git directory.

The downside of this is that the pristine-tar diff file will be fairly
large.
---
 import-upstream | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/import-upstream b/import-upstream
index 9b01f25..48be98c 100755
--- a/import-upstream
+++ b/import-upstream
@@ -37,7 +37,7 @@ fi
 
 git rm -rf --ignore-unmatch . || exit 1
 git clean -d -f -x || exit 1
-tar --strip-components=1 -x -f $tarfile || exit 1
+tar --strip-components=1 -x --exclude .git -f $tarfile || exit 1
 git add -f -A -- . || exit 1
 git commit -m"Imported Bugzilla $version." || exit 1
 git tag bugzilla-$version || exit 1
-- 
GitLab