#
#
# patch "cmd_list.cc"
#  from [bd12d9df9a26a4fc189681a3a374a211357ab9d2]
#    to [d776611e29b3a5f1b99fb0d67c4a0e12895dfa5d]
# 
# patch "project.cc"
#  from [b3e058f60be065000801b36916c50876b6287133]
#    to [7305f8dd01ef56293cfd034af13bbb3bea8bb49b]
# 
# patch "project.hh"
#  from [07509eac20359a3488d2264d85923f0e8f4c75fa]
#    to [c4d25911415d8279de6b1dcf4c206d4c335d6c5c]
#
============================================================
--- 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)
============================================================
--- project.cc	b3e058f60be065000801b36916c50876b6287133
+++ project.cc	7305f8dd01ef56293cfd034af13bbb3bea8bb49b
@@ -21,7 +21,7 @@ void
 {}
 
 void
-project_t::get_branch_list(std::set<branch_name> & names, bool allow_suspend_certs)
+project_t::get_branch_list(std::set<branch_name> & names, bool check_certs_valid)
 {
   if (indicator.outdated())
     {
@@ -37,10 +37,10 @@ project_t::get_branch_list(std::set<bran
           const branch_name branch(*i);
           std::set<revision_id> heads;
 
-          if (allow_suspend_certs)
+          if (check_certs_valid)
             get_branch_heads(branch, heads, &inverse_graph_cache);
           
-          if (!allow_suspend_certs || !heads.empty())
+          if (!check_certs_valid || !heads.empty())
             branches.insert(branch);
         }
     }
@@ -51,7 +51,7 @@ project_t::get_branch_list(globish const
 void
 project_t::get_branch_list(globish const & glob,
                            std::set<branch_name> & names,
-                           bool allow_suspend_certs)
+                           bool check_certs_valid)
 {
   std::vector<std::string> got;
   app.db.get_branches(glob, got);
@@ -65,10 +65,10 @@ project_t::get_branch_list(globish const
       const branch_name branch(*i);
       std::set<revision_id> heads;
 
-      if (allow_suspend_certs)
+      if (check_certs_valid)
         get_branch_heads(branch, heads, &inverse_graph_cache);
 
-      if (!allow_suspend_certs || !heads.empty())
+      if (!check_certs_valid || !heads.empty())
         names.insert(branch);
     }
 }
============================================================
--- project.hh	07509eac20359a3488d2264d85923f0e8f4c75fa
+++ project.hh	c4d25911415d8279de6b1dcf4c206d4c335d6c5c
@@ -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 check_certs_valid = true);
   void get_branch_list(globish const & glob, std::set<branch_name> & names,
-                        bool allow_suspend_certs = true);
+                        bool check_certs_valid = true);
   void get_branch_heads(branch_name const & name, std::set<revision_id> & heads,
                         std::multimap<revision_id, revision_id> *inverse_graph_cache_ptr = NULL);