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 b73bf3965b979dc2111f6bbd29f5f4668f2093ba..087dc2169e07a2b6a71bc14d66f27872e18e2d08 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,8 @@ dgit (4.2~) experimental; urgency=medium
     Sean Whitton]  Closes:#856402.
 
   Minor fixes:
     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]
 
   * Fix grammar error in 4.1 changelog entry. [Sean Whitton]
   * Remove some whitespace "errors". [Sean Whitton]
 

diff --git a/dgit b/dgit
index 33e32395a3efb548618a0ea45da6d6e5cf68fcdb..3a9b46c13330bd9931ea46bb72cebf9175adf4eb 100755 (executable)
--- 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:
                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,
            $split_brain = 1;
            $dgithead = splitbrain_pseudomerge($clogp,
                                               $actualhead, $dgithead,