Fix inaccurate error message when archive's git hash is not an ancestor of git repo...

diff --git a/debian/changelog b/debian/changelog
index 5422a93bdec7448addbd2dcd5e2cbe916eb50405..a5abed6774420e336f3e3e346f4dbb3afa3e2607 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -58,6 +58,9 @@ dgit (0.23~) unstable; urgency=low
   * Document in manpage under `dgit push' that it is best to build with
     dgit too.  Closes:#763333.
 
   * Document in manpage under `dgit push' that it is best to build with
     dgit too.  Closes:#763333.
 

+  * Fix inaccurate error message when archive's git hash is not an
+    ancestor of git repo's git hash.
+

  --
 
 dgit (0.22.1) unstable; urgency=high
  --
 
 dgit (0.22.1) unstable; urgency=high

diff --git a/dgit b/dgit
index 2e67eb5be574b26115d412101be1956c314d9bfb..a73fffddc1d635aa44512b3e6e4199d2ddffdf5c 100755 (executable)
--- a/dgit
+++ b/dgit
@@ -1355,8 +1355,8 @@ $later_warning_msg
 END
            $hash = $lastpush_hash;
        } else {
 END
            $hash = $lastpush_hash;
        } else {

-           fail "archive's .dsc refers to ".$dsc_hash.
-               " but this is an ancestor of ".$lastpush_hash;
+           fail "git head (".lrref()."=$lastpush_hash) is not a ".
+               "descendant of archive's .dsc hash ($dsc_hash)";

        }
     } elsif ($dsc) {
        $hash = generate_commit_from_dsc();
        }
     } elsif ($dsc) {
        $hash = generate_commit_from_dsc();