From 97f49a475f82fa7526767cec5dad23669f3b394d Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Fri, 10 Mar 2017 17:43:57 +0000
Subject: [PATCH] dgit: mkdir .git/info in setup_gitattrs

This might be necessary if setup_mergechangelogs were disabled.
(This is something of a latent bug, since `git init' creates
.git/info.)

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---
 debian/changelog | 1 +
 dgit             | 1 +
 2 files changed, 2 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 741c0559..3aa6a14d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ dgit (3.11~) unstable; urgency=high
     the user's object store.  In particular, core.sharedRepository.
     Prompted by #867603.
   * Clone multisuite works even without --no-rm-on-error.  Closes:#867434.
+  * Work if "git init" does not create $GIT/info.  Closes:#858054.
 
   Important bugfixes to other components:
   * dgit-badcommit-fixup: Honour core.sharedRepository.   Closes:#867603.
diff --git a/dgit b/dgit
index 40b8e32a..743e8694 100755
--- a/dgit
+++ b/dgit
@@ -3380,6 +3380,7 @@ END
 	return;
     }
     my $af = ".git/info/attributes";
+    ensuredir '.git/info';
     open GAO, "> $af.new" or die $!;
     print GAO <<END or die $!;
 *	dgit-defuse-attrs
-- 
2.30.2