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

diff --git a/debian/changelog b/debian/changelog
index 910c34dc84937902c16049c135e353c34e1d4ea6..84cf7dec2cce2376a9e0091116d14ec126269da4 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ dgit (0.9) unstable; urgency=low
   * In push, double-check the .changes against the changelog.
   * Better error when source package contains .git.  Closes: #720555.
   * Change our .dsc field name to `Dgit'.  Relevant to #720201.
+  * Fix bug handling our synthetic merges when we see them in
+    the remote suite branch.
 
  --
 

diff --git a/dgit b/dgit
index 88f018d36a6b750e5c81b047b006e648d63bdce8..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",