#
#
# patch "automate.cc"
#  from [0e3aa435aad9e048ed08f99e8ebd06c6c8e2ba9e]
#    to [ea61140510bd7451cfa4444f478001e81f1ba206]
# 
# patch "cmd_list.cc"
#  from [bd12d9df9a26a4fc189681a3a374a211357ab9d2]
#    to [d776611e29b3a5f1b99fb0d67c4a0e12895dfa5d]
# 
# patch "database.cc"
#  from [331c15584601bfa5585b5169af3bc597196a0c47]
#    to [d36a920b633f8d14a1b06756d0eb0e569c1dd608]
# 
# patch "project.hh"
#  from [07509eac20359a3488d2264d85923f0e8f4c75fa]
#    to [1d080bcfb302a3118e06f68f0b64d2ec3fa41aff]
#
============================================================
--- automate.cc	0e3aa435aad9e048ed08f99e8ebd06c6c8e2ba9e
+++ automate.cc	ea61140510bd7451cfa4444f478001e81f1ba206
@@ -1422,7 +1422,7 @@ CMD_AUTOMATE(branches, "",
 
   set<branch_name> names;
 
-  app.get_project().get_branch_list(names);
+  app.get_project().get_branch_list(names, !app.opts.ignore_suspend_certs);
 
   for (set<branch_name>::const_iterator i = names.begin();
        i != names.end(); ++i)
============================================================
--- cmd_list.cc	bd12d9df9a26a4fc189681a3a374a211357ab9d2
+++ cmd_list.cc	d776611e29b3a5f1b99fb0d67c4a0e12895dfa5d
@@ -281,7 +281,7 @@ CMD(branches, "branches", "", CMD_REF(li
 
   globish exc(app.opts.exclude_patterns);
   set<branch_name> names;
-  app.get_project().get_branch_list(inc, names);
+  app.get_project().get_branch_list(inc, names, !app.opts.ignore_suspend_certs);
 
   for (set<branch_name>::const_iterator i = names.begin();
        i != names.end(); ++i)
============================================================
--- database.cc	331c15584601bfa5585b5169af3bc597196a0c47
+++ database.cc	d36a920b633f8d14a1b06756d0eb0e569c1dd608
@@ -2978,7 +2978,7 @@ void database::complete(selector_type ty
                 }
               else
                 {
-                  __app->get_project().get_branch_list(globish(i->second), branch_names);
+                  __app->get_project().get_branch_list(globish(i->second), branch_names, true);
                 }
 
                 L(FL("found %d matching branches") % branch_names.size());
============================================================
--- project.hh	07509eac20359a3488d2264d85923f0e8f4c75fa
+++ project.hh	1d080bcfb302a3118e06f68f0b64d2ec3fa41aff
@@ -35,9 +35,9 @@ public:
 public:
   project_t(app_state & app);
 
-  void get_branch_list(std::set<branch_name> & names, bool allow_suspend_certs = true);
+  void get_branch_list(std::set<branch_name> & names, bool allow_suspend_certs);
   void get_branch_list(globish const & glob, std::set<branch_name> & names,
-                        bool allow_suspend_certs = true);
+                        bool allow_suspend_certs);
   void get_branch_heads(branch_name const & name, std::set<revision_id> & heads,
                         std::multimap<revision_id, revision_id> *inverse_graph_cache_ptr = NULL);