X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=dgit;h=f9c46c036cb00c037a6457e87546eac5f6a35c30;hb=9d4fe1fe846ac76795a42661aa4bb73335c07aad;hp=94adcb5fd856349b8a2ec52bb56d1de74738257a;hpb=5a4dc24f3a020c36a4171d5448cf8a0f50c91f75;p=dgit.git

diff --git a/dgit b/dgit
index 94adcb5f..f9c46c03 100755
--- a/dgit
+++ b/dgit
@@ -659,11 +659,12 @@ sub fetch_from_archive () {
     if (defined $dsc_hash) {
 	fail "missing git history even though dsc has hash -".
 	    " could not find commit $dsc_hash".
-	    " (should be in ".access_giturl()."#".rref().")"
+	    " (should be in ".access_giturl()."#".rrref().")"
 	    unless $upload_hash;
 	$hash = $dsc_hash;
 	ensure_we_have_orig();
-	if (is_fast_fwd($dsc_hash,$upload_hash)) {
+	if ($dsc_hash eq $upload_hash) {
+	} elsif (is_fast_fwd($dsc_hash,$upload_hash)) {
 	    print STDERR <<END or die $!;
 
 Git commit in archive is behind the last version allegedly pushed/uploaded.
@@ -672,6 +673,9 @@ Last allegedly pushed/uploaded: $upload_hash
 $later_warning_msg
 END
 	    $hash = $upload_hash;
+	} else {
+	    fail "archive's .dsc refers to ".$dsc_hash.
+		" but this is an ancestor of ".$upload_hash;
 	}
     } else {
 	$hash = generate_commit_from_dsc();
@@ -934,6 +938,9 @@ sub cmd_push {
     } else {
 	badusage "incorrect arguments to dgit push";
     }
+    if (check_for_git()) {
+	git_fetch_us();
+    }
     if (fetch_from_archive()) {
 	is_fast_fwd(lrref(), 'HEAD') or die;
     } else {