X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=dgit;h=2a2eeddb2705cfcc2593cd68c7dc6c5942ba9c64;hb=4723806663cc562af68cb68a9f0c18548942bad8;hp=e4eba536122933c2d6528d8803d2c1d6b46a1cc6;hpb=418c2224e319a38ea2288d7ee5aacb4d04a390d7;p=dgit.git

diff --git a/dgit b/dgit
index e4eba536..2a2eeddb 100755
--- a/dgit
+++ b/dgit
@@ -2571,11 +2571,8 @@ sub fetch_from_archive () {
     };
 
     if (defined $dsc_hash) {
-	fail "missing remote git history even though dsc has hash -".
-	    " could not find ref ".rref()." at ".access_giturl()
-	    unless $lastpush_hash;
 	ensure_we_have_orig();
-	if ($dsc_hash eq $lastpush_hash) {
+	if (!$lastpush_hash || $dsc_hash eq $lastpush_hash) {
 	    @mergeinputs = $dsc_mergeinput
 	} elsif (is_fast_fwd($dsc_hash,$lastpush_hash)) {
 	    print STDERR <<END or die $!;
@@ -2742,7 +2739,8 @@ END
 	die "$lasth $hash $what ?" unless is_fast_fwd($lasth, $hash);
     };
 
-    $chkff->($lastpush_hash, 'dgit repo server tip (last push)');
+    $chkff->($lastpush_hash, 'dgit repo server tip (last push)')
+	if $lastpush_hash;
     $chkff->($lastfetch_hash, 'local tracking tip (last fetch)');
 
     runcmd @git, qw(update-ref -m), "dgit fetch $csuite",