X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=dgit;h=879adea2c6252f64e9bb9cae537cbb53744aa30f;hb=1698ba5933326f9895504af33a94ac6ee8f5321d;hp=55a20df84c70415c30389416f4a71404a5193f84;hpb=e5038c74011be7177d65aa58437a020b0948812d;p=dgit.git

diff --git a/dgit b/dgit
index 55a20df8..879adea2 100755
--- a/dgit
+++ b/dgit
@@ -2506,9 +2506,16 @@ END
     if (check_for_git()) {
 	git_fetch_us();
     }
+    my $archive_hash = fetch_from_archive();
+    if (!$archive_hash) {
+	$new_package or
+	    fail "package appears to be new in this suite;".
+	        " if this is intentional, use --new";
+    }
+
     my $forceflag = '';
-    if (fetch_from_archive()) {
-	if (is_fast_fwd(lrref(), 'HEAD')) {
+    if ($archive_hash) {
+	if (is_fast_fwd($archive_hash, 'HEAD')) {
 	    # ok
 	} elsif (deliberately_not_fast_forward) {
 	    $forceflag = '+';
@@ -2520,10 +2527,6 @@ END
 		"dgit: To rewind history, if permitted by the archive,".
 		" use --deliberately-not-fast-forward";
 	}
-    } else {
-	$new_package or
-	    fail "package appears to be new in this suite;".
-	        " if this is intentional, use --new";
     }
 
     supplementary_message(<<'END');