dgit: Defuse gitattributes in private working area, always

Even if we don't do it in the user's tree because config
setup-gitattributes=false.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/debian/changelog b/debian/changelog
index 66aa5e9ec91023d5c4951073196eafb2f188e2ec..4c73fea9ade45e7282d5f4283538fb197a6574b1 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ dgit (3.5~) unstable; urgency=medium
 
   Bugfixes:
   * Improve comment left in .git/info/attributes.
+  * Defuse gitattributes in private working area even if we don't do it in
+    the user's tree because config setup-gitattributes=false.
 
  --
 

diff --git a/dgit b/dgit
index 3ff58a7e156e7bbc2f8f119400c963a58bce5b0e..dae194c0dc3ad53b6ba5400568e7a6eb81fcb039 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -1699,7 +1699,7 @@ sub mktree_in_ud_here () {
     runcmd qw(git config gc.auto 0);
     rmtree('.git/objects');
     symlink '../../../../objects','.git/objects' or die $!;
-    setup_gitattrs();
+    setup_gitattrs(1);
 }
 
 sub git_write_tree () {