diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2017-01-17 13:01:50 +0000 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2017-01-17 21:52:47 +0000 |
commit | afb06f88d468e045aa615db3304ed734a2149af2 (patch) | |
tree | ceb9add9d6f3be560e02641501e3fed3e8091536 | |
parent | 376bac56f8eb4d081c630ef08585165a1860ec0c (diff) |
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>
-rw-r--r-- | debian/changelog | 2 | ||||
-rwxr-xr-x | dgit | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index 4c73fea..4940aa3 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. -- @@ -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); } |