From e7a1580f7fb3ee23bf36de01a055a4b48a817d0c Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Tue, 17 Jan 2017 12:49:44 +0000 Subject: [PATCH] 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 --- debian/changelog | 2 ++ dgit | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 66aa5e9e..4c73fea9 100644 --- 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 3ff58a7e..dae194c0 100755 --- 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 () { -- 2.30.2