Fix bug handling our synthetic merges when we see them in the remote suite branch.

[dgit.git] / dgit

diff --git a/dgit b/dgit
index 3e7bffca2e0caf0ca0e73f2c5b4f5a5cba5c97c5..c0c7b8df4d23cfec766dd346035964d2b7715d85 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -591,12 +591,9 @@ Last allegedly pushed/uploaded: $oversion (newer or same)
 $later_warning_msg
 END
             $outputhash = $upload_hash;
-       } elsif ($outputhash ne $upload_hash) {
-           fail "version in archive ($cversion)".
-               " is same as version in git".
-               " to-be-uploaded (upload/) branch ($oversion)".
-               " but archive version hash no commit hash?!";
-        }
+        } else {
+           $outputhash = $upload_hash;
+       }
     }
     chdir '../../../..' or die $!;
     runcmd @git, qw(update-ref -m),"dgit fetch import $cversion",
@@ -645,7 +642,7 @@ sub fetch_from_archive () {
     #  one way or another
     get_archive_dsc() or return 0;
     foreach my $field (@ourdscfield) {
-       $dsc_hash = $dsc->{$ourdscfield};
+       $dsc_hash = $dsc->{$field};
        last if defined $dsc_hash;
     }
     if (defined $dsc_hash) {