dgit: clonee: Do setup_new_tree earlier.

This avoids printing a spurious warning about actually-defused
gitattributes when cloning.  Closes:#851624.

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

diff --git a/debian/changelog b/debian/changelog
index 4c73fea9ade45e7282d5f4283538fb197a6574b1..4940aa38d64bcad99c73fc5809a0ecd691cf5078 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ dgit (3.5~) unstable; urgency=medium
   * 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.
+  * Do not print spurious warning about actually-defused gitattributes
+    when cloning.  Closes:#851624.
 
  --
 

diff --git a/dgit b/dgit
index dae194c0dc3ad53b6ba5400568e7a6eb81fcb039..eb42b00dee0cb75d71e803280ff1c9f3677a2417 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -3601,6 +3601,7 @@ sub clone ($) {
     mkdir $dstdir or fail "create \`$dstdir': $!";
     changedir $dstdir;
     runcmd @git, qw(init -q);
+    setup_new_tree();
     clone_set_head();
     my $giturl = access_giturl(1);
     if (defined $giturl) {
@@ -3619,7 +3620,6 @@ sub clone ($) {
        $vcsgiturl =~ s/\s+-b\s+\S+//g;
        runcmd @git, qw(remote add vcs-git), $vcsgiturl;
     }
-    setup_new_tree();
     clone_finish($dstdir);
 }