#
#
# patch "work.cc"
#  from [c0fb90e7eacf1cd942f091a0e5f15e8663216117]
#    to [84dc74091e3318424da00b914dd904d3e884ce5f]
# 
# patch "work.hh"
#  from [45263b3d38c4b8772f69daaf16fd3858f5c36c8c]
#    to [3a96efd140b80cfafff521c5c99bb187b16faed3]
#
============================================================
--- work.cc	c0fb90e7eacf1cd942f091a0e5f15e8663216117
+++ work.cc	84dc74091e3318424da00b914dd904d3e884ce5f
@@ -102,11 +102,17 @@ void
 bool workspace::branch_is_sticky;
 
 void
+workspace::require_workspace()
+{
+  N(workspace::found,
+    F("workspace required but not found"));
+}
+
+void
 workspace::require_workspace(i18n_format const & explanation)
 {
-  string e = explanation.str();
   N(workspace::found,
-    F("workspace required but not found%s%s") % (e.empty() ? "" : "\n") % e);
+    F("workspace required but not found\n%s") % explanation.str());
 }
 
 void
@@ -159,7 +165,7 @@ workspace::workspace(app_state & app, bo
 workspace::workspace(app_state & app, bool writeback_options)
   : lua(app.lua)
 {
-  require_workspace(F(""));
+  require_workspace();
   if (writeback_options)
     set_ws_options(app.opts, false);
 }
============================================================
--- work.hh	45263b3d38c4b8772f69daaf16fd3858f5c36c8c
+++ work.hh	3a96efd140b80cfafff521c5c99bb187b16faed3
@@ -97,6 +97,7 @@ public:
 
   // Interfaces.
 public:
+  static void require_workspace();
   static void require_workspace(i18n_format const & explanation);
 
   static void create_workspace(options const & opts,