X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=dgit;h=b7888afb7673da6cab9f06a87e64cbb33adbc1ea;hb=7dcdcdd7c58d7ea097088f76909b04d0ba0db5f6;hp=eb42b00dee0cb75d71e803280ff1c9f3677a2417;hpb=afb06f88d468e045aa615db3304ed734a2149af2;p=dgit.git

diff --git a/dgit b/dgit
index eb42b00d..b7888afb 100755
--- a/dgit
+++ b/dgit
@@ -669,7 +669,7 @@ sub git_get_config ($) {
     my ($c) = @_;
     foreach my $src (@gitcfgsources) {
 	my $l = $gitcfgs{$src}{$c};
-	croak "$l $c" if $l && !ref $l;
+	confess "internal error ($l $c)" if $l && !ref $l;
 	printdebug"C $c ".(defined $l ?
 			   join " ", map { messagequote "'$_'" } @$l :
 			   "undef")."\n"
@@ -2572,7 +2572,7 @@ sub lrfetchref_used ($) {
 }
 
 sub git_lrfetch_sane {
-    my ($supplementary, @specs) = @_;
+    my ($url, $supplementary, @specs) = @_;
     # Make a 'refs/'.lrfetchrefs.'/*' be just like on server,
     # at least as regards @specs.  Also leave the results in
     # %lrfetchrefs_f, and arrange for lrfetchref_used to be
@@ -2603,8 +2603,6 @@ sub git_lrfetch_sane {
     # git fetch to try to generate it.  If we don't manage to generate
     # the target state, we try again.
 
-    my $url = access_giturl();
-
     printdebug "git_lrfetch_sane suppl=$supplementary specs @specs\n";
 
     my $specre = join '|', map {
@@ -2744,7 +2742,8 @@ sub git_fetch_us () {
     push @specs, $rewritemap;
     push @specs, qw(heads/*) if deliberately_not_fast_forward;
 
-    git_lrfetch_sane 0, @specs;
+    my $url = access_giturl();
+    git_lrfetch_sane $url, 0, @specs;
 
     my %here;
     my @tagpats = debiantags('*',access_nomdistro);
@@ -2873,13 +2872,13 @@ END
 		or fail <<END;
 .dsc Dgit metadata is in context of distro $dsc_distro
 for which we have no configured url;
-.dsc provices hinted url with protocol $proto which is unsafe.
+.dsc provides hinted url with protocol $proto which is unsafe.
 (can be overridden by config - consult documentation)
 END
 	    $url = $dsc_hint_url;
 	}
 
-	git_lrfetch_sane 1, @fetch;
+	git_lrfetch_sane $url, 1, @fetch;
 
 	return $lrf;
     };