From 233fa856bec4d90e55531f54b81a264273cd4cb8 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Wed, 15 Apr 2015 18:05:09 +0100
Subject: [PATCH] Fix inaccurate error message when archive's git hash is not
 an ancestor of git repo's git hash.

---
 debian/changelog | 3 +++
 dgit             | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5422a93b..a5abed67 100644
--- 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.
 
+  * 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
diff --git a/dgit b/dgit
index 2e67eb5b..a73fffdd 100755
--- a/dgit
+++ b/dgit
@@ -1355,8 +1355,8 @@ $later_warning_msg
 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();
-- 
2.30.2