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>

diff --git a/debian/changelog b/debian/changelog
index 741c0559e814378fa0f9a7889cfb59b2b3d66ae3..3aa6a14d9a09a61afe5e9a8cb091327b50fd03d0 100644 (file)
--- 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 40b8e32aba4a6378f742381076d1812b239c45f1..743e8694af12817854c2d4ed45503d6f4ce1c972 100755 (executable)
--- 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