From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 18 Sep 2016 11:45:01 +0000 (+0100)
Subject: Push reorg: Introduce $archive_hash in dopush (nfc)
X-Git-Tag: archive/debian/2.0~166
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;ds=sidebyside;h=d29d82031f1e2907e219b04916112cd5236bc476;p=dgit.git

Push reorg: Introduce $archive_hash in dopush (nfc)

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

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');