chiark / gitweb /
dgit: Fix message about missing quilt cache entry
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 6 Jan 2018 01:42:36 +0000 (01:42 +0000)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 6 Jan 2018 01:42:49 +0000 (01:42 +0000)
Should refer to HEAD rather than tree, since dgit needs a commit.

Closes:#884646.

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

index b73bf39..087dc21 100644 (file)
@@ -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 33e3239..3a9b46c 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:
- perhaps tree changed since dgit build[-source] ?";
+ perhaps HEAD changed since dgit build[-source] ?";
            $split_brain = 1;
            $dgithead = splitbrain_pseudomerge($clogp,
                                               $actualhead, $dgithead,