diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-01-06 01:42:36 +0000 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-01-06 01:42:49 +0000 |
commit | 0f141266f28e1cf9ffb421d7362596825fbe6acb (patch) | |
tree | db364d58fa07c354421b72b1c4507dfb9a0103d0 | |
parent | 53391de137eb887e0807d7e0339a855c5140451a (diff) |
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>
-rw-r--r-- | debian/changelog | 2 | ||||
-rwxr-xr-x | dgit | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index b73bf39..087dc21 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] @@ -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, |