From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 6 Jan 2018 01:42:36 +0000 (+0000)
Subject: dgit: Fix message about missing quilt cache entry
X-Git-Tag: archive/debian/4.2~30
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=0f141266f28e1cf9ffb421d7362596825fbe6acb

dgit: Fix message about missing quilt cache entry

Should refer to HEAD rather than tree, since dgit needs a commit.

Closes:#884646.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/debian/changelog b/debian/changelog
index b73bf396..087dc216 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,8 @@ dgit (4.2~) experimental; urgency=medium
     Sean Whitton]  Closes:#856402.
 
   Minor fixes:
+  * Fix message about missing quilt cache entry to refer to
+    HEAD rather than tree, since dgit needs a commit.  Closes:#884646.
   * Fix grammar error in 4.1 changelog entry. [Sean Whitton]
   * Remove some whitespace "errors". [Sean Whitton]
 
diff --git a/dgit b/dgit
index 33e32395..3a9b46c1 100755
--- a/dgit
+++ b/dgit
@@ -4188,7 +4188,7 @@ END
 		quilt_check_splitbrain_cache($actualhead, $upstreamversion);
 	    $dgithead or fail
  "--quilt=$quilt_mode but no cached dgit view:
- perhaps tree changed since dgit build[-source] ?";
+ perhaps HEAD changed since dgit build[-source] ?";
 	    $split_brain = 1;
 	    $dgithead = splitbrain_pseudomerge($clogp,
 					       $actualhead, $dgithead,