X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=dgit;h=aa5da935179512bc3390096faa6ebf0269ae15ff;hb=6cd2df7eeec8f951c6b7971b1e1ffdce04dd633b;hp=0f9236cef4916d75191db2a1f3f41a662fafcb7c;hpb=5ca654531c85b6bb69eb4a324dbe2244c2ac2a3a;p=dgit.git

diff --git a/dgit b/dgit
index 0f9236ce..aa5da935 100755
--- a/dgit
+++ b/dgit
@@ -3090,15 +3090,15 @@ END
 
 sub clone ($) {
     my ($dstdir) = @_;
-    canonicalise_suite();
     badusage "dry run makes no sense with clone" unless act_local();
+    canonicalise_suite();
     my $hasgit = check_for_git();
     mkdir $dstdir or fail "create \`$dstdir': $!";
     changedir $dstdir;
     runcmd @git, qw(init -q);
+    clone_set_head();
     my $giturl = access_giturl(1);
     if (defined $giturl) {
-	clone_set_head();
 	runcmd @git, qw(remote add), 'origin', $giturl;
     }
     if ($hasgit) {
@@ -3119,6 +3119,7 @@ sub clone ($) {
 }
 
 sub fetch () {
+    canonicalise_suite();
     if (check_for_git()) {
 	git_fetch_us();
     }
@@ -3867,6 +3868,7 @@ sub cmd_clone {
 		return if $!==&ENOENT;
 		die "chdir $cwd_remove: $!";
 	    }
+	    printdebug "clone rmonerror removing $dstdir\n";
 	    if (stat $dstdir) {
 		rmtree($dstdir) or die "remove $dstdir: $!\n";
 	    } elsif (grep { $! == $_ }
@@ -3897,16 +3899,13 @@ sub fetchpullargs () {
 	$package = getfield $sourcep, 'Source';
     }
     if (@ARGV==0) {
-#	$isuite = branchsuite();  # this doesn't work because dak hates canons
+	$isuite = branchsuite();
 	if (!$isuite) {
 	    my $clogp = parsechangelog();
 	    $isuite = getfield $clogp, 'Distribution';
 	}
-	canonicalise_suite();
-	progress "fetching from suite $csuite";
     } elsif (@ARGV==1) {
 	($isuite) = @ARGV;
-	canonicalise_suite();
     } else {
 	badusage "incorrect arguments to dgit fetch or dgit pull";
     }