From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Tue, 17 Jan 2017 13:01:50 +0000 (+0000)
Subject: dgit: clonee: Do setup_new_tree earlier.
X-Git-Tag: archive/debian/3.5~4
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=afb06f88d468e045aa615db3304ed734a2149af2

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 4c73fea9..4940aa38 100644
--- 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 dae194c0..eb42b00d 100755
--- 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);
 }